Changeset: 299837e9ed12 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=299837e9ed12 Modified Files: sql/test/pg_regress/Tests/numeric.sql sql/test/pg_regress/Tests/numeric_big.sql sql/test/pg_regress/Tests/sanity_check.sql sql/test/pg_regress/Tests/vacuum.sql sql/test/pg_regress/Tests/vacuum.stable.err 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:
There is no VACUUM statement in the SQL standard. Changed usages of the VACUUM statement into comment lines. Adpated postgresql2sql99.sh diffs (truncated from 2347 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 @@ -496,14 +496,15 @@ 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); ---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; +-- 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 diff --git a/sql/test/pg_regress/Tests/numeric_big.sql b/sql/test/pg_regress/Tests/numeric_big.sql --- a/sql/test/pg_regress/Tests/numeric_big.sql +++ b/sql/test/pg_regress/Tests/numeric_big.sql @@ -508,14 +508,15 @@ 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); -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; +-- 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 diff --git a/sql/test/pg_regress/Tests/sanity_check.sql b/sql/test/pg_regress/Tests/sanity_check.sql --- a/sql/test/pg_regress/Tests/sanity_check.sql +++ b/sql/test/pg_regress/Tests/sanity_check.sql @@ -1,4 +1,4 @@ -VACUUM; +/* VACUUM; */ -- -- sanity check, if we don't have indices the test will take years to diff --git a/sql/test/pg_regress/Tests/vacuum.sql b/sql/test/pg_regress/Tests/vacuum.sql --- a/sql/test/pg_regress/Tests/vacuum.sql +++ b/sql/test/pg_regress/Tests/vacuum.sql @@ -1,6 +1,8 @@ -- -- VACUUM -- +-- There is no VACUUM statement in the SQL standard. +-- CREATE TABLE vactst (i INT); INSERT INTO vactst VALUES (1); @@ -17,9 +19,11 @@ INSERT INTO vactst SELECT * FROM vactst; INSERT INTO vactst SELECT * FROM vactst; INSERT INTO vactst VALUES (0); SELECT count(*) FROM vactst; -DELETE FROM vactst WHERE i != 0; +SELECT i, count(*) AS count FROM vactst GROUP BY i ORDER BY i; +SELECT count(*) FROM vactst WHERE i <> 0; +DELETE FROM vactst WHERE i <> 0; SELECT * FROM vactst; -VACUUM FULL vactst; +/* VACUUM FULL vactst; */ UPDATE vactst SET i = i + 1; INSERT INTO vactst SELECT * FROM vactst; INSERT INTO vactst SELECT * FROM vactst; @@ -34,8 +38,10 @@ INSERT INTO vactst SELECT * FROM vactst; INSERT INTO vactst SELECT * FROM vactst; INSERT INTO vactst VALUES (0); SELECT count(*) FROM vactst; -DELETE FROM vactst WHERE i != 0; -VACUUM FULL vactst; +SELECT i, count(*) AS count FROM vactst GROUP BY i ORDER BY i; +SELECT count(*) FROM vactst WHERE i <> 0; +DELETE FROM vactst WHERE i <> 0; +/* VACUUM FULL vactst; */ DELETE FROM vactst; SELECT * FROM vactst; diff --git a/sql/test/pg_regress/Tests/vacuum.stable.err b/sql/test/pg_regress/Tests/vacuum.stable.err --- a/sql/test/pg_regress/Tests/vacuum.stable.err +++ b/sql/test/pg_regress/Tests/vacuum.stable.err @@ -25,15 +25,9 @@ stderr of test 'vacuum` in directory 'sq # cmdline opt mal_listing = 0 # cmdline opt gdk_debug = 536870922 -# 17:11:19 > -# 17:11:19 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-1142" "--port=38959" -# 17:11:19 > -#-- -#-- VACUUM -#-- -# 17:11:19 > -# 17:11:19 > "Done." -# 17:11:19 > +# 16:38:22 > +# 16:38:22 > "Done." +# 16:38:22 > diff --git a/sql/test/pg_regress/Tests/vacuum.stable.out b/sql/test/pg_regress/Tests/vacuum.stable.out --- a/sql/test/pg_regress/Tests/vacuum.stable.out +++ b/sql/test/pg_regress/Tests/vacuum.stable.out @@ -35,45 +35,53 @@ Ready. #INSERT INTO vactst SELECT * FROM vactst; [ 1 ] #INSERT INTO vactst SELECT * FROM vactst; -[ 1 ] +[ 2 ] #INSERT INTO vactst SELECT * FROM vactst; -[ 1 ] +[ 4 ] #INSERT INTO vactst SELECT * FROM vactst; -[ 1 ] +[ 8 ] #INSERT INTO vactst SELECT * FROM vactst; -[ 1 ] +[ 16 ] #INSERT INTO vactst SELECT * FROM vactst; -[ 1 ] +[ 32 ] #INSERT INTO vactst SELECT * FROM vactst; -[ 1 ] +[ 64 ] #INSERT INTO vactst SELECT * FROM vactst; -[ 1 ] +[ 128 ] #INSERT INTO vactst SELECT * FROM vactst; -[ 1 ] +[ 256 ] #INSERT INTO vactst SELECT * FROM vactst; -[ 1 ] +[ 512 ] #INSERT INTO vactst SELECT * FROM vactst; -[ 1 ] +[ 1024 ] #INSERT INTO vactst VALUES (0); [ 1 ] #SELECT count(*) FROM vactst; -% sys.L0 # table_name -% count # name -% ? # type -% ? # length +% sys.L1 # table_name +% L1 # name +% wrd # type +% 4 # length [ 2049 ] - -DELETE FROM vactst WHERE i != 0; +#SELECT i, count(*) AS count FROM vactst GROUP BY i ORDER BY i; +% sys.vactst, sys.L1 # table_name +% i, count # name +% int, wrd # type +% 1, 4 # length +[ 0, 1 ] +[ 1, 2048 ] +#SELECT count(*) FROM vactst WHERE i <> 0; +% sys.L1 # table_name +% L1 # name +% wrd # type +% 1 # length +[ 0 ] +#DELETE FROM vactst WHERE i <> 0; +[ 0 ] #SELECT * FROM vactst; -% sys.L0 # table_name +% sys.vactst # table_name % i # name -% ? # type -% ? # length -[ 0 ] - -VACUUM FULL vactst; -#UPDATE vactst SET i = i + 1; -#INSERT INTO vactst SELECT * FROM vactst; +% int # type +% 1 # length [ 1 ] #INSERT INTO vactst SELECT * FROM vactst; [ 1 ] @@ -97,26 +105,2100 @@ VACUUM FULL vactst; [ 1 ] #INSERT INTO vactst VALUES (0); [ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] +[ 1 ] _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
