Changeset: 55e7804d89ad for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=55e7804d89ad
Removed Files:
sql/test/orderidx/Tests/simpletable.stable.out.32bit
sql/test/orderidx/Tests/smalltable.stable.out.32bit
Modified Files:
sql/test/orderidx/Tests/simpletable.sql
sql/test/orderidx/Tests/simpletable.stable.out
sql/test/orderidx/Tests/simpletable.test
sql/test/orderidx/Tests/smalltable.sql
sql/test/orderidx/Tests/smalltable.stable.out
sql/test/orderidx/Tests/smalltable.test
Branch: default
Log Message:
Do a slightly different test to test for an ordered index existence, so no
specific 32bit output is required
diffs (truncated from 695 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,12 +2,12 @@ CREATE TABLE xtmp1(i integer);
INSERT INTO xtmp1 VALUES (1),(2),(4),(0),(10),(7),(3),(1),(1),(-4),(-9),(-1);
SELECT * FROM xtmp1;
-SELECT schema, table, column, type, mode, count, hashes, phash, imprints,
sorted, orderidx FROM storage(current_schema, 'xtmp1');
+SELECT schema, table, column, type, mode, count, hashes, phash, imprints,
sorted, orderidx > 0 FROM storage(current_schema, 'xtmp1');
ALTER TABLE xtmp1 SET READ ONLY;
--call createorderindex('sys','xtmp1','i');
CREATE ORDERED INDEX sys_xtmp1_i_oidx ON xtmp1(i);
-SELECT schema, table, column, type, mode, count, hashes, phash, imprints,
sorted, orderidx FROM storage(current_schema, 'xtmp1');
+SELECT schema, table, column, type, mode, count, hashes, phash, imprints,
sorted, orderidx > 0 FROM storage(current_schema, 'xtmp1');
SELECT * FROM xtmp1 WHERE i<0;
SELECT * FROM xtmp1 WHERE i<1;
diff --git a/sql/test/orderidx/Tests/simpletable.stable.out
b/sql/test/orderidx/Tests/simpletable.stable.out
--- a/sql/test/orderidx/Tests/simpletable.stable.out
+++ b/sql/test/orderidx/Tests/simpletable.stable.out
@@ -84,17 +84,17 @@ stdout of test 'simpletable` in director
#SELECT schema, table, column, type, mode, count, hashes, phash, imprints,
sorted, orderidx FROM storage(current_schema, 'xtmp1');
% .%3, .%3, .%3, .%3, .%3, .%3, .%3, .%3, .%3, .%3,
.%3 # table_name
% schema, table, column, type, mode, count, hashes, phash,
imprints, sorted, orderidx # name
-% varchar, varchar, varchar, varchar, varchar,
bigint, bigint, boolean, bigint, boolean, bigint # type
+% varchar, varchar, varchar, varchar, varchar,
bigint, bigint, boolean, bigint, boolean, boolean # type
% 3, 5, 1, 3, 8, 2, 1, 5, 1, 5,
1 # length
-[ "sys", "xtmp1", "i", "int", "writable", 12, 0,
false, 0, false, 0 ]
+[ "sys", "xtmp1", "i", "int", "writable", 12, 0,
false, 0, false, false ]
#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(current_schema, 'xtmp1');
% .%3, .%3, .%3, .%3, .%3, .%3, .%3, .%3, .%3, .%3,
.%3 # table_name
% schema, table, column, type, mode, count, hashes, phash,
imprints, sorted, orderidx # name
-% varchar, varchar, varchar, varchar, varchar,
bigint, bigint, boolean, bigint, boolean, bigint # type
+% varchar, varchar, varchar, varchar, varchar,
bigint, bigint, boolean, bigint, boolean, boolean # type
% 3, 5, 1, 3, 8, 2, 1, 5, 1, 5,
3 # length
-[ "sys", "xtmp1", "i", "int", "readonly", 12, 0,
false, 0, false, 120 ]
+[ "sys", "xtmp1", "i", "int", "readonly", 12, 0,
false, 0, false, true ]
#SELECT * FROM xtmp1 WHERE i<0;
% sys.xtmp1 # table_name
% i # name
diff --git a/sql/test/orderidx/Tests/simpletable.stable.out.32bit
b/sql/test/orderidx/Tests/simpletable.stable.out.32bit
deleted file mode 100644
--- a/sql/test/orderidx/Tests/simpletable.stable.out.32bit
+++ /dev/null
@@ -1,183 +0,0 @@
-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
-# 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
-# MonetDB/SQL module loaded
-
-
-# 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(current_schema, 'xtmp1');
-% .%3, .%3, .%3, .%3, .%3, .%3, .%3, .%3, .%3, .%3,
.%3 # table_name
-% schema, table, column, type, mode, count, hashes, phash,
imprints, sorted, orderidx # name
-% varchar, varchar, varchar, varchar, varchar,
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(current_schema, 'xtmp1');
-% .%3, .%3, .%3, .%3, .%3, .%3, .%3, .%3, .%3, .%3,
.%3 # table_name
-% schema, table, column, type, mode, count, hashes, phash,
imprints, sorted, orderidx # name
-% varchar, varchar, varchar, varchar, varchar,
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/simpletable.test
b/sql/test/orderidx/Tests/simpletable.test
--- a/sql/test/orderidx/Tests/simpletable.test
+++ b/sql/test/orderidx/Tests/simpletable.test
@@ -7,12 +7,33 @@ INSERT INTO xtmp1 VALUES (1),(2),(4),(0)
query I rowsort
SELECT * FROM xtmp1
----
-12 values hashing to 79c2fc4656e2efecc6234b0b30f31f5d
+-1
+-4
+-9
+0
+1
+1
+1
+10
+2
+3
+4
+7
-query TTTTTIITITI rowsort
-SELECT schema, table, column, type, mode, count, hashes, phash, imprints,
sorted, orderidx FROM storage(current_schema, 'xtmp1')
+query TTTTTIITITT rowsort
+SELECT schema, table, column, type, mode, count, hashes, phash, imprints,
sorted, orderidx > 0 FROM storage(current_schema, 'xtmp1')
----
-11 values hashing to e2c40acce8780f75ba49f0184e69334b
+sys
+xtmp1
+i
+int
+writable
+12
+0
+False
+0
+False
+False
statement ok
ALTER TABLE xtmp1 SET READ ONLY
@@ -20,10 +41,20 @@ ALTER TABLE xtmp1 SET READ ONLY
statement ok
CREATE ORDERED INDEX sys_xtmp1_i_oidx ON xtmp1(i)
-query TTTTTIITITI rowsort
-SELECT schema, table, column, type, mode, count, hashes, phash, imprints,
sorted, orderidx FROM storage(current_schema, 'xtmp1')
+query TTTTTIITITT rowsort
+SELECT schema, table, column, type, mode, count, hashes, phash, imprints,
sorted, orderidx > 0 FROM storage(current_schema, 'xtmp1')
----
-11 values hashing to 2c4fdc8dbf8800c22ee6e102683f713b
+sys
+xtmp1
+i
+int
+readonly
+12
+0
+False
+0
+False
+True
query I rowsort
SELECT * FROM xtmp1 WHERE i<0
@@ -54,12 +85,31 @@ 1
query I rowsort
SELECT * FROM xtmp1 WHERE i<5
----
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
