Changeset: 1a1e5f30de2e for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1a1e5f30de2e Added Files: monetdb5/modules/mosaic/Tests/mosaic_date_1.delta.MAL.py monetdb5/modules/mosaic/Tests/mosaic_date_1.delta.stable.err monetdb5/modules/mosaic/Tests/mosaic_date_1.delta.stable.out monetdb5/modules/mosaic/Tests/mosaic_date_1.dictionary.MAL.py monetdb5/modules/mosaic/Tests/mosaic_date_1.dictionary.stable.err monetdb5/modules/mosaic/Tests/mosaic_date_1.dictionary.stable.out monetdb5/modules/mosaic/Tests/mosaic_date_1.frame.MAL.py monetdb5/modules/mosaic/Tests/mosaic_date_1.frame.stable.err monetdb5/modules/mosaic/Tests/mosaic_date_1.frame.stable.out monetdb5/modules/mosaic/Tests/mosaic_date_1.mal monetdb5/modules/mosaic/Tests/mosaic_date_1.prefix.MAL.py monetdb5/modules/mosaic/Tests/mosaic_date_1.prefix.stable.err monetdb5/modules/mosaic/Tests/mosaic_date_1.prefix.stable.out monetdb5/modules/mosaic/Tests/mosaic_date_1.raw.MAL.py monetdb5/modules/mosaic/Tests/mosaic_date_1.raw.stable.err monetdb5/modules/mosaic/Tests/mosaic_date_1.raw.stable.out monetdb5/modules/mosaic/Tests/mosaic_date_2.linear.MAL.py monetdb5/modules/mosaic/Tests/mosaic_date_2.linear.stable.err monetdb5/modules/mosaic/Tests/mosaic_date_2.linear.stable.out monetdb5/modules/mosaic/Tests/mosaic_date_2.mal monetdb5/modules/mosaic/Tests/mosaic_date_2.runlength.MAL.py monetdb5/modules/mosaic/Tests/mosaic_date_2.runlength.stable.err monetdb5/modules/mosaic/Tests/mosaic_date_2.runlength.stable.out Removed Files: monetdb5/modules/mosaic/Tests/mosaic_delta_date.malC monetdb5/modules/mosaic/Tests/mosaic_delta_date.stable.err monetdb5/modules/mosaic/Tests/mosaic_delta_date.stable.out monetdb5/modules/mosaic/Tests/mosaic_dictionary_date.malC monetdb5/modules/mosaic/Tests/mosaic_dictionary_date.stable.err monetdb5/modules/mosaic/Tests/mosaic_dictionary_date.stable.out monetdb5/modules/mosaic/Tests/mosaic_frame_date.malC monetdb5/modules/mosaic/Tests/mosaic_frame_date.stable.err monetdb5/modules/mosaic/Tests/mosaic_frame_date.stable.out monetdb5/modules/mosaic/Tests/mosaic_linear_date.malC monetdb5/modules/mosaic/Tests/mosaic_linear_date.stable.err monetdb5/modules/mosaic/Tests/mosaic_linear_date.stable.out monetdb5/modules/mosaic/Tests/mosaic_prefix_date.malC monetdb5/modules/mosaic/Tests/mosaic_prefix_date.stable.err monetdb5/modules/mosaic/Tests/mosaic_prefix_date.stable.out monetdb5/modules/mosaic/Tests/mosaic_raw_date.malC monetdb5/modules/mosaic/Tests/mosaic_raw_date.stable.err monetdb5/modules/mosaic/Tests/mosaic_raw_date.stable.out monetdb5/modules/mosaic/Tests/mosaic_runlength_date.malC monetdb5/modules/mosaic/Tests/mosaic_runlength_date.stable.err monetdb5/modules/mosaic/Tests/mosaic_runlength_date.stable.out Modified Files: monetdb5/modules/mosaic/Tests/All Branch: mosaic Log Message:
Migrate all date tests to Python. diffs (truncated from 20417 to 300 lines): diff --git a/monetdb5/modules/mosaic/Tests/All b/monetdb5/modules/mosaic/Tests/All --- a/monetdb5/modules/mosaic/Tests/All +++ b/monetdb5/modules/mosaic/Tests/All @@ -29,40 +29,40 @@ mosaic_mix_joins mosaic_bit_1.raw mosaic_lng_1.raw mosaic_oid_1.raw -mosaic_raw_date +mosaic_date_1.raw mosaic_raw_timestamp mosaic_bit_2.runlength mosaic_lng_2.runlength mosaic_oid_2.runlength -mosaic_runlength_date +mosaic_date_2.runlength mosaic_runlength_timestamp mosaic_bit_1.dictionary mosaic_lng_1.dictionary mosaic_oid_1.dictionary -mosaic_dictionary_date +mosaic_date_1.dictionary mosaic_dictionary_timestamp mosaic_lng_1.delta mosaic_oid_1.delta -mosaic_delta_date +mosaic_date_1.delta mosaic_delta_timestamp mosaic_bit_2.linear mosaic_lng_2.linear mosaic_oid_2.linear -mosaic_linear_date +mosaic_date_2.linear mosaic_linear_timestamp mosaic_bit_1.frame mosaic_lng_1.frame mosaic_oid_1.frame -mosaic_frame_date +mosaic_date_1.frame mosaic_frame_timestamp mosaic_bit_1.prefix mosaic_lng_1.prefix mosaic_oid_1.prefix -mosaic_prefix_date +mosaic_date_1.prefix mosaic_prefix_timestamp diff --git a/monetdb5/modules/mosaic/Tests/mosaic_lng_1.dictionary.MAL.py b/monetdb5/modules/mosaic/Tests/mosaic_date_1.delta.MAL.py copy from monetdb5/modules/mosaic/Tests/mosaic_lng_1.dictionary.MAL.py copy to monetdb5/modules/mosaic/Tests/mosaic_date_1.delta.MAL.py diff --git a/monetdb5/modules/mosaic/Tests/mosaic_date_1.delta.stable.err b/monetdb5/modules/mosaic/Tests/mosaic_date_1.delta.stable.err new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mosaic/Tests/mosaic_date_1.delta.stable.err @@ -0,0 +1,30 @@ +stderr of test 'mosaic_date_1.delta` in directory 'monetdb5/modules/mosaic` itself: + + +# 14:02:13 > +# 14:02:13 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31292" "--set" "mapi_usock=/var/tmp/mtest-18999/.s.monetdb.31292" "--forcemito" "--dbpath=/home/aris/sources/monetdb/build/installation/var/MonetDB/mTests_monetdb5_modules_mosaic" "--set" "embedded_c=true" +# 14:02:13 > + +# builtin opt gdk_dbpath = /home/aris/sources/monetdb/build/installation/var/monetdb5/dbfarm/demo +# builtin opt mapi_port = 50000 +# builtin opt mapi_open = false +# builtin opt mapi_ipv6 = false +# builtin opt mapi_autosense = false +# builtin opt sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# cmdline opt gdk_nr_threads = 0 +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 31292 +# cmdline opt mapi_usock = /var/tmp/mtest-18999/.s.monetdb.31292 +# cmdline opt gdk_dbpath = /home/aris/sources/monetdb/build/installation/var/MonetDB/mTests_monetdb5_modules_mosaic +# cmdline opt embedded_c = true + +# 14:02:13 > +# 14:02:13 > "/usr/bin/python3" "mosaic_date_1.delta.MAL.py" "mosaic_date_1.delta" +# 14:02:13 > + + +# 14:02:13 > +# 14:02:13 > "Done." +# 14:02:13 > + diff --git a/monetdb5/modules/mosaic/Tests/mosaic_raw_date.stable.out b/monetdb5/modules/mosaic/Tests/mosaic_date_1.delta.stable.out rename from monetdb5/modules/mosaic/Tests/mosaic_raw_date.stable.out rename to monetdb5/modules/mosaic/Tests/mosaic_date_1.delta.stable.out --- a/monetdb5/modules/mosaic/Tests/mosaic_raw_date.stable.out +++ b/monetdb5/modules/mosaic/Tests/mosaic_date_1.delta.stable.out @@ -1,4 +1,4 @@ -stdout of test 'mosaic_raw_date` in directory 'monetdb5/modules/mosaic` itself: +stdout of test 'mosaic_date_1.delta` in directory 'monetdb5/modules/mosaic` itself: # 17:20:28 > diff --git a/monetdb5/modules/mosaic/Tests/mosaic_lng_1.dictionary.MAL.py b/monetdb5/modules/mosaic/Tests/mosaic_date_1.dictionary.MAL.py copy from monetdb5/modules/mosaic/Tests/mosaic_lng_1.dictionary.MAL.py copy to monetdb5/modules/mosaic/Tests/mosaic_date_1.dictionary.MAL.py diff --git a/monetdb5/modules/mosaic/Tests/mosaic_date_1.dictionary.stable.err b/monetdb5/modules/mosaic/Tests/mosaic_date_1.dictionary.stable.err new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mosaic/Tests/mosaic_date_1.dictionary.stable.err @@ -0,0 +1,30 @@ +stderr of test 'mosaic_date_1.dictionary` in directory 'monetdb5/modules/mosaic` itself: + + +# 14:02:11 > +# 14:02:11 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31292" "--set" "mapi_usock=/var/tmp/mtest-18999/.s.monetdb.31292" "--forcemito" "--dbpath=/home/aris/sources/monetdb/build/installation/var/MonetDB/mTests_monetdb5_modules_mosaic" "--set" "embedded_c=true" +# 14:02:11 > + +# builtin opt gdk_dbpath = /home/aris/sources/monetdb/build/installation/var/monetdb5/dbfarm/demo +# builtin opt mapi_port = 50000 +# builtin opt mapi_open = false +# builtin opt mapi_ipv6 = false +# builtin opt mapi_autosense = false +# builtin opt sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# cmdline opt gdk_nr_threads = 0 +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 31292 +# cmdline opt mapi_usock = /var/tmp/mtest-18999/.s.monetdb.31292 +# cmdline opt gdk_dbpath = /home/aris/sources/monetdb/build/installation/var/MonetDB/mTests_monetdb5_modules_mosaic +# cmdline opt embedded_c = true + +# 14:02:11 > +# 14:02:11 > "/usr/bin/python3" "mosaic_date_1.dictionary.MAL.py" "mosaic_date_1.dictionary" +# 14:02:11 > + + +# 14:02:11 > +# 14:02:11 > "Done." +# 14:02:11 > + diff --git a/monetdb5/modules/mosaic/Tests/mosaic_raw_date.stable.out b/monetdb5/modules/mosaic/Tests/mosaic_date_1.dictionary.stable.out copy from monetdb5/modules/mosaic/Tests/mosaic_raw_date.stable.out copy to monetdb5/modules/mosaic/Tests/mosaic_date_1.dictionary.stable.out --- a/monetdb5/modules/mosaic/Tests/mosaic_raw_date.stable.out +++ b/monetdb5/modules/mosaic/Tests/mosaic_date_1.dictionary.stable.out @@ -1,4 +1,4 @@ -stdout of test 'mosaic_raw_date` in directory 'monetdb5/modules/mosaic` itself: +stdout of test 'mosaic_date_1.dictionary` in directory 'monetdb5/modules/mosaic` itself: # 17:20:28 > diff --git a/monetdb5/modules/mosaic/Tests/mosaic_lng_1.dictionary.MAL.py b/monetdb5/modules/mosaic/Tests/mosaic_date_1.frame.MAL.py copy from monetdb5/modules/mosaic/Tests/mosaic_lng_1.dictionary.MAL.py copy to monetdb5/modules/mosaic/Tests/mosaic_date_1.frame.MAL.py diff --git a/monetdb5/modules/mosaic/Tests/mosaic_date_1.frame.stable.err b/monetdb5/modules/mosaic/Tests/mosaic_date_1.frame.stable.err new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mosaic/Tests/mosaic_date_1.frame.stable.err @@ -0,0 +1,30 @@ +stderr of test 'mosaic_date_1.frame` in directory 'monetdb5/modules/mosaic` itself: + + +# 14:02:18 > +# 14:02:18 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31292" "--set" "mapi_usock=/var/tmp/mtest-18999/.s.monetdb.31292" "--forcemito" "--dbpath=/home/aris/sources/monetdb/build/installation/var/MonetDB/mTests_monetdb5_modules_mosaic" "--set" "embedded_c=true" +# 14:02:18 > + +# builtin opt gdk_dbpath = /home/aris/sources/monetdb/build/installation/var/monetdb5/dbfarm/demo +# builtin opt mapi_port = 50000 +# builtin opt mapi_open = false +# builtin opt mapi_ipv6 = false +# builtin opt mapi_autosense = false +# builtin opt sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# cmdline opt gdk_nr_threads = 0 +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 31292 +# cmdline opt mapi_usock = /var/tmp/mtest-18999/.s.monetdb.31292 +# cmdline opt gdk_dbpath = /home/aris/sources/monetdb/build/installation/var/MonetDB/mTests_monetdb5_modules_mosaic +# cmdline opt embedded_c = true + +# 14:02:18 > +# 14:02:18 > "/usr/bin/python3" "mosaic_date_1.frame.MAL.py" "mosaic_date_1.frame" +# 14:02:18 > + + +# 14:02:19 > +# 14:02:19 > "Done." +# 14:02:19 > + diff --git a/monetdb5/modules/mosaic/Tests/mosaic_raw_date.stable.out b/monetdb5/modules/mosaic/Tests/mosaic_date_1.frame.stable.out copy from monetdb5/modules/mosaic/Tests/mosaic_raw_date.stable.out copy to monetdb5/modules/mosaic/Tests/mosaic_date_1.frame.stable.out --- a/monetdb5/modules/mosaic/Tests/mosaic_raw_date.stable.out +++ b/monetdb5/modules/mosaic/Tests/mosaic_date_1.frame.stable.out @@ -1,4 +1,4 @@ -stdout of test 'mosaic_raw_date` in directory 'monetdb5/modules/mosaic` itself: +stdout of test 'mosaic_date_1.frame` in directory 'monetdb5/modules/mosaic` itself: # 17:20:28 > diff --git a/monetdb5/modules/mosaic/Tests/mosaic_raw_date.malC b/monetdb5/modules/mosaic/Tests/mosaic_date_1.mal rename from monetdb5/modules/mosaic/Tests/mosaic_raw_date.malC rename to monetdb5/modules/mosaic/Tests/mosaic_date_1.mal --- a/monetdb5/modules/mosaic/Tests/mosaic_raw_date.malC +++ b/monetdb5/modules/mosaic/Tests/mosaic_date_1.mal @@ -29,7 +29,7 @@ bat.append(a,"2014-09-20":date); bat.append(a,"2014-09-25":date); bat.append(a,"2014-10-05":date); bat.append(a,"2014-10-02":date); -mosaic.compress(a,"raw"); +mosaic.compress(a,"{compression_type}"); c:= mosaic.decompress(a); eq := batcalc.==(a, c); io.print(a, c, eq); diff --git a/monetdb5/modules/mosaic/Tests/mosaic_lng_1.dictionary.MAL.py b/monetdb5/modules/mosaic/Tests/mosaic_date_1.prefix.MAL.py copy from monetdb5/modules/mosaic/Tests/mosaic_lng_1.dictionary.MAL.py copy to monetdb5/modules/mosaic/Tests/mosaic_date_1.prefix.MAL.py diff --git a/monetdb5/modules/mosaic/Tests/mosaic_date_1.prefix.stable.err b/monetdb5/modules/mosaic/Tests/mosaic_date_1.prefix.stable.err new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mosaic/Tests/mosaic_date_1.prefix.stable.err @@ -0,0 +1,30 @@ +stderr of test 'mosaic_date_1.prefix` in directory 'monetdb5/modules/mosaic` itself: + + +# 14:02:21 > +# 14:02:21 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31292" "--set" "mapi_usock=/var/tmp/mtest-18999/.s.monetdb.31292" "--forcemito" "--dbpath=/home/aris/sources/monetdb/build/installation/var/MonetDB/mTests_monetdb5_modules_mosaic" "--set" "embedded_c=true" +# 14:02:21 > + +# builtin opt gdk_dbpath = /home/aris/sources/monetdb/build/installation/var/monetdb5/dbfarm/demo +# builtin opt mapi_port = 50000 +# builtin opt mapi_open = false +# builtin opt mapi_ipv6 = false +# builtin opt mapi_autosense = false +# builtin opt sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# cmdline opt gdk_nr_threads = 0 +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 31292 +# cmdline opt mapi_usock = /var/tmp/mtest-18999/.s.monetdb.31292 +# cmdline opt gdk_dbpath = /home/aris/sources/monetdb/build/installation/var/MonetDB/mTests_monetdb5_modules_mosaic +# cmdline opt embedded_c = true + +# 14:02:21 > +# 14:02:21 > "/usr/bin/python3" "mosaic_date_1.prefix.MAL.py" "mosaic_date_1.prefix" +# 14:02:21 > + + +# 14:02:21 > +# 14:02:21 > "Done." +# 14:02:21 > + diff --git a/monetdb5/modules/mosaic/Tests/mosaic_raw_date.stable.out b/monetdb5/modules/mosaic/Tests/mosaic_date_1.prefix.stable.out copy from monetdb5/modules/mosaic/Tests/mosaic_raw_date.stable.out copy to monetdb5/modules/mosaic/Tests/mosaic_date_1.prefix.stable.out --- a/monetdb5/modules/mosaic/Tests/mosaic_raw_date.stable.out +++ b/monetdb5/modules/mosaic/Tests/mosaic_date_1.prefix.stable.out @@ -1,4 +1,4 @@ -stdout of test 'mosaic_raw_date` in directory 'monetdb5/modules/mosaic` itself: +stdout of test 'mosaic_date_1.prefix` in directory 'monetdb5/modules/mosaic` itself: # 17:20:28 > diff --git a/monetdb5/modules/mosaic/Tests/mosaic_lng_1.dictionary.MAL.py b/monetdb5/modules/mosaic/Tests/mosaic_date_1.raw.MAL.py copy from monetdb5/modules/mosaic/Tests/mosaic_lng_1.dictionary.MAL.py copy to monetdb5/modules/mosaic/Tests/mosaic_date_1.raw.MAL.py diff --git a/monetdb5/modules/mosaic/Tests/mosaic_date_1.raw.stable.err b/monetdb5/modules/mosaic/Tests/mosaic_date_1.raw.stable.err new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mosaic/Tests/mosaic_date_1.raw.stable.err @@ -0,0 +1,30 @@ +stderr of test 'mosaic_date_1.raw` in directory 'monetdb5/modules/mosaic` itself: + + +# 14:02:06 > +# 14:02:06 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31292" "--set" "mapi_usock=/var/tmp/mtest-18999/.s.monetdb.31292" "--forcemito" "--dbpath=/home/aris/sources/monetdb/build/installation/var/MonetDB/mTests_monetdb5_modules_mosaic" "--set" "embedded_c=true" +# 14:02:06 > + +# builtin opt gdk_dbpath = /home/aris/sources/monetdb/build/installation/var/monetdb5/dbfarm/demo +# builtin opt mapi_port = 50000 +# builtin opt mapi_open = false +# builtin opt mapi_ipv6 = false +# builtin opt mapi_autosense = false +# builtin opt sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# cmdline opt gdk_nr_threads = 0 +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 31292 +# cmdline opt mapi_usock = /var/tmp/mtest-18999/.s.monetdb.31292 +# cmdline opt gdk_dbpath = /home/aris/sources/monetdb/build/installation/var/MonetDB/mTests_monetdb5_modules_mosaic +# cmdline opt embedded_c = true + +# 14:02:06 > +# 14:02:06 > "/usr/bin/python3" "mosaic_date_1.raw.MAL.py" "mosaic_date_1.raw" +# 14:02:06 > + + +# 14:02:07 > +# 14:02:07 > "Done." +# 14:02:07 > + diff --git a/monetdb5/modules/mosaic/Tests/mosaic_raw_date.stable.out b/monetdb5/modules/mosaic/Tests/mosaic_date_1.raw.stable.out _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list