Changeset: f37277fd7bb9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f37277fd7bb9
Modified Files:
sql/test/pg_regress/Tests/numeric.sql
sql/test/pg_regress/Tests/numeric.stable.err
sql/test/pg_regress/Tests/numeric.stable.out
sql/test/pg_regress/Tests/numeric_big.sql
sql/test/pg_regress/Tests/numeric_big.stable.err
sql/test/pg_regress/Tests/numeric_big.stable.out
sql/test/pg_regress/Tests/vacuum.sql
sql/test/pg_regress/Tests/vacuum.stable.out
sql/test/pg_regress/Tests/without_oid.sql
sql/test/pg_regress/postgresql2sql99.sh
Branch: default
Log Message:
MonetDB does not support the vacumm statement but does have a stored procedure
called vacuum(). Restored the VACUUM statements and replaced them with stored
procedure calls.
Added substitution rules to postgress2sql99.sh
Updated stable.out and stable.err files
diffs (truncated from 5131 to 300 lines):
diff --git a/sql/test/pg_regress/Tests/numeric.sql
b/sql/test/pg_regress/Tests/numeric.sql
--- a/sql/test/pg_regress/Tests/numeric.sql
+++ b/sql/test/pg_regress/Tests/numeric.sql
@@ -2,17 +2,17 @@
-- NUMERIC
--
-CREATE TABLE num_data (id integer, val numeric(38,10));
-CREATE TABLE num_exp_add (id1 integer, id2 integer, expected numeric(38,10));
-CREATE TABLE num_exp_sub (id1 integer, id2 integer, expected numeric(38,10));
-CREATE TABLE num_exp_div (id1 integer, id2 integer, expected numeric(38,10));
-CREATE TABLE num_exp_mul (id1 integer, id2 integer, expected numeric(38,10));
-CREATE TABLE num_exp_sqrt (id integer, expected numeric(38,10));
-CREATE TABLE num_exp_ln (id integer, expected numeric(38,10));
-CREATE TABLE num_exp_log10 (id integer, expected numeric(38,10));
-CREATE TABLE num_exp_power_10_ln (id integer, expected numeric(38,10));
+CREATE TABLE num_data (id integer, val numeric(38,20));
+CREATE TABLE num_exp_add (id1 integer, id2 integer, expected numeric(38,20));
+CREATE TABLE num_exp_sub (id1 integer, id2 integer, expected numeric(38,20));
+CREATE TABLE num_exp_div (id1 integer, id2 integer, expected numeric(38,20));
+CREATE TABLE num_exp_mul (id1 integer, id2 integer, expected numeric(38,20));
+CREATE TABLE num_exp_sqrt (id integer, expected numeric(38,20));
+CREATE TABLE num_exp_ln (id integer, expected numeric(38,20));
+CREATE TABLE num_exp_log10 (id integer, expected numeric(38,20));
+CREATE TABLE num_exp_power_10_ln (id integer, expected numeric(38,20));
-CREATE TABLE num_result (id1 integer, id2 integer, result numeric(38,10));
+CREATE TABLE num_result (id1 integer, id2 integer, result numeric(38,20));
-- ******************************
@@ -483,6 +483,16 @@ INSERT INTO num_data VALUES (8, '74881')
INSERT INTO num_data VALUES (9, '-24926804.045047420');
--COMMIT;
+-- Replaced PostgreSQL "VACUUM ANALYZE my_table;" with MonetDB "call
vacuum('sys', 'my_table');"
+call vacuum('sys', 'num_exp_add');
+call vacuum('sys', 'num_exp_sub');
+call vacuum('sys', 'num_exp_div');
+call vacuum('sys', 'num_exp_mul');
+call vacuum('sys', 'num_exp_sqrt');
+call vacuum('sys', 'num_exp_ln');
+call vacuum('sys', 'num_exp_log10');
+call vacuum('sys', 'num_exp_power_10_ln');
+
-- ******************************
-- * Create indices for faster checks
-- ******************************
@@ -496,16 +506,6 @@ CREATE UNIQUE INDEX num_exp_ln_idx ON nu
CREATE UNIQUE INDEX num_exp_log10_idx ON num_exp_log10 (id);
CREATE UNIQUE INDEX num_exp_power_10_ln_idx ON num_exp_power_10_ln (id);
--- There is no VACUUM statement in the SQL standard.
-/* VACUUM ANALYZE num_exp_add; */
-/* VACUUM ANALYZE num_exp_sub; */
-/* VACUUM ANALYZE num_exp_div; */
-/* VACUUM ANALYZE num_exp_mul; */
-/* VACUUM ANALYZE num_exp_sqrt; */
-/* VACUUM ANALYZE num_exp_ln; */
-/* VACUUM ANALYZE num_exp_log10; */
-/* VACUUM ANALYZE num_exp_power_10_ln; */
-
-- ******************************
-- * Now check the behaviour of the NUMERIC type
-- ******************************
@@ -522,12 +522,12 @@ SELECT t1.id1, t1.id2, t1.result, t2.exp
AND t1.result <> t2.expected;
DELETE FROM num_result;
-INSERT INTO num_result SELECT t1.id, t2.id, round(t1.val + t2.val, 10)
+INSERT INTO num_result SELECT t1.id, t2.id, round(t1.val + t2.val, 20)
FROM num_data t1, num_data t2;
-SELECT t1.id1, t1.id2, t1.result, round(t2.expected, 10) as expected
+SELECT t1.id1, t1.id2, t1.result, round(t2.expected, 20) as expected
FROM num_result t1, num_exp_add t2
WHERE t1.id1 = t2.id1 AND t1.id2 = t2.id2
- AND t1.result <> round(t2.expected, 10);
+ AND t1.result <> round(t2.expected, 20);
-- ******************************
-- * Subtraction check
diff --git a/sql/test/pg_regress/Tests/numeric.stable.err
b/sql/test/pg_regress/Tests/numeric.stable.err
--- a/sql/test/pg_regress/Tests/numeric.stable.err
+++ b/sql/test/pg_regress/Tests/numeric.stable.err
@@ -29,435 +29,61 @@ stderr of test 'numeric` in directory 's
# 17:11:19 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-1142" "--port=38959"
# 17:11:19 >
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_div VALUES (0,0,'NaN');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_div VALUES (0,1,'NaN');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_add VALUES (0,7,'-83028485');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_sub VALUES (0,7,'83028485');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_add VALUES (0,8,'74881');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_sub VALUES (0,8,'-74881');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_div VALUES (1,0,'NaN');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_div VALUES (1,1,'NaN');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_add VALUES (1,7,'-83028485');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_sub VALUES (1,7,'83028485');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_add VALUES (1,8,'74881');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_sub VALUES (1,8,'-74881');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_div VALUES (2,0,'NaN');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_div VALUES (2,1,'NaN');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES
(2,2,'1179132047626883.596862135856320209');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES (2,3,'-147998901.44836127257');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES (2,4,'-267821744976817.8111137106593');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES (2,5,'-563049578578.769242506736077');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES
(2,6,'-3224438592470.18449811926184222');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_add VALUES (2,7,'-117366977.215397047');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES (2,7,'2851072985828710.485883795');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES (2,8,'-2571300635581.146276407');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES
(2,9,'855948866655588.453741509242968740');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_div VALUES (3,0,'NaN');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_div VALUES (3,1,'NaN');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES (3,2,'-147998901.44836127257');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES (3,7,'-357852770.35');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES (3,9,'-107434525.43415438020');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_div VALUES (4,0,'NaN');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_div VALUES (4,1,'NaN');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES (4,2,'-267821744976817.8111137106593');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES (4,4,'60831598315717.14146161');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES (4,5,'127888068979.9935054429');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES (4,6,'732381731243.745115764094');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES (4,7,'-647577464846017.9715');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES (4,8,'584031469984.4839');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES (4,9,'-194415646271340.1815956522980');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_div VALUES (5,0,'NaN');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_div VALUES (5,1,'NaN');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES (5,2,'-563049578578.769242506736077');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES (5,4,'127888068979.9935054429');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES (5,5,'268862871.275335557081');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES (5,6,'1539707782.76899778633766');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES (5,7,'-1361421264394.416135');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES (5,8,'1227826639.244571');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES (5,9,'-408725765384.257043660243220');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_div VALUES (6,0,'NaN');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_div VALUES (6,1,'NaN');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES
(6,2,'-3224438592470.18449811926184222');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES (6,4,'732381731243.745115764094');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES (6,5,'1539707782.76899778633766');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES (6,6,'8817506281.4517452372676676');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES (6,7,'-7796505729750.37795610');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES (6,8,'7031444034.53149906');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES
(6,9,'-2340666225110.29929521292692920');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_add VALUES (7,0,'-83028485');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_sub VALUES (7,0,'-83028485');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_div VALUES (7,0,'NaN');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_add VALUES (7,1,'-83028485');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_sub VALUES (7,1,'-83028485');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_div VALUES (7,1,'NaN');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_add VALUES (7,2,'-117366977.215397047');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES (7,2,'2851072985828710.485883795');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES (7,3,'-357852770.35');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES (7,4,'-647577464846017.9715');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES (7,5,'-1361421264394.416135');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES (7,6,'-7796505729750.37795610');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_add VALUES (7,7,'-166056970');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_mul VALUES (7,7,'6893729321395225');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_add VALUES (7,8,'-82953604');
-
-MAPI = (monetdb) /var/tmp/mtest-4390/.s.monetdb.35682
-QUERY = INSERT INTO num_exp_sub VALUES (7,8,'-83103366');
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
