Changeset: cb04c663bf55 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cb04c663bf55 Removed Files: monetdb5/modules/mosaic/Tests/mosaic_zone.malC monetdb5/modules/mosaic/Tests/mosaic_zone.stable.err monetdb5/modules/mosaic/Tests/mosaic_zone.stable.out monetdb5/modules/mosaic/Tests/mosaic_zone_joins.malC monetdb5/modules/mosaic/Tests/mosaic_zone_joins.stable.err monetdb5/modules/mosaic/Tests/mosaic_zone_joins.stable.out monetdb5/modules/mosaic/Tests/mosaic_zone_select.malC monetdb5/modules/mosaic/Tests/mosaic_zone_select.stable.err monetdb5/modules/mosaic/Tests/mosaic_zone_select.stable.out monetdb5/modules/mosaic/Tests/mosaic_zone_thetaselect.malC monetdb5/modules/mosaic/Tests/mosaic_zone_thetaselect.stable.err monetdb5/modules/mosaic/Tests/mosaic_zone_thetaselect.stable.out Modified Files: monetdb5/modules/mosaic/Tests/All Branch: mosaic Log Message:
We don't have zone compression. diffs (truncated from 1182 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 @@ -1,14 +1,12 @@ mosaic_runlength mosaic_mix mosaic_dictionary -mosaic_zone mosaic_delta mosaic_linear mosaic_prefix mosaic_runlength_select mosaic_dictionary_select -mosaic_zone_select mosaic_delta_select mosaic_linear_select mosaic_prefix_select @@ -16,7 +14,6 @@ mosaic_mix_select mosaic_runlength_thetaselect mosaic_dictionary_thetaselect -mosaic_zone_thetaselect mosaic_delta_thetaselect mosaic_linear_thetaselect mosaic_prefix_thetaselect @@ -24,7 +21,6 @@ mosaic_mix_thetaselect mosaic_runlength_joins mosaic_dictionary_joins -mosaic_zone_joins mosaic_delta_joins mosaic_linear_joins mosaic_prefix_joins diff --git a/monetdb5/modules/mosaic/Tests/mosaic_zone.malC b/monetdb5/modules/mosaic/Tests/mosaic_zone.malC deleted file mode 100644 --- a/monetdb5/modules/mosaic/Tests/mosaic_zone.malC +++ /dev/null @@ -1,39 +0,0 @@ -#zone compression -b:= bat.new(:int); -bat.append(b,50); -bat.append(b,19531015); -bat.append(b,9); -b:= bat.append(b,b); -base:= algebra.copy(b); - -io.print(base); -mosaic.compress(b,"zone"); -b:= mosaic.decompress(b); -io.print(b); -bs:= bat.new(:timestamp); -bat.append(bs,"2014-08-14 12:00:00":timestamp); -bat.append(bs,"2014-08-14 12:00:00":timestamp); -bat.append(bs,"2014-08-14 12:00:00":timestamp); -bat.append(bs,"2014-08-14 12:00:00":timestamp); -bat.append(bs,"2014-08-14 12:00:00":timestamp); -bat.append(bs,"2014-08-14 12:01:00":timestamp); -bat.append(bs,"2014-08-14 12:02:00":timestamp); -bs:= bat.append(bs,bs); - -io.print(bs); -mosaic.compress(bs,"zone"); -bs:= mosaic.decompress(bs); -io.print(bs); - -d:= bat.new(:date); -bat.append(d,"2014-08-14":date); -bat.append(d,"2014-08-14":date); -bat.append(d,"2014-08-14":date); -bat.append(d,"2014-08-14":date); -bat.append(d,"2014-08-15":date); -d:= bat.append(d,d); - -io.print(d); -mosaic.compress(d,"zone"); -d:= mosaic.decompress(d); -io.print(d); diff --git a/monetdb5/modules/mosaic/Tests/mosaic_zone.stable.err b/monetdb5/modules/mosaic/Tests/mosaic_zone.stable.err deleted file mode 100644 --- a/monetdb5/modules/mosaic/Tests/mosaic_zone.stable.err +++ /dev/null @@ -1,30 +0,0 @@ -stderr of test 'mosaic_zone` in directory 'monetdb5/modules/mosaic` itself: - - -# 17:24:13 > -# 17:24:13 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=33832" "--set" "mapi_usock=/var/tmp/mtest-18516/.s.monetdb.33832" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/mosaic//Linux/var/MonetDB/mTests_monetdb5_modules_mal" "mosaic_zone.mal" -# 17:24:13 > - -# builtin opt gdk_dbpath = /export/scratch1/mk/mosaic//Linux/var/monetdb5/dbfarm/demo -# builtin opt gdk_debug = 0 -# builtin opt gdk_vmtrim = no -# builtin opt monet_prompt = > -# builtin opt monet_daemon = no -# builtin opt mapi_port = 50000 -# builtin opt mapi_open = 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 = 33832 -# cmdline opt mapi_usock = /var/tmp/mtest-18516/.s.monetdb.33832 -# cmdline opt monet_prompt = -# cmdline opt mal_listing = 2 -# cmdline opt gdk_dbpath = /export/scratch1/mk/mosaic//Linux/var/MonetDB/mTests_monetdb5_modules_mal -# cmdline opt gdk_debug = 536870922 - -# 17:24:13 > -# 17:24:13 > "Done." -# 17:24:13 > - diff --git a/monetdb5/modules/mosaic/Tests/mosaic_zone.stable.out b/monetdb5/modules/mosaic/Tests/mosaic_zone.stable.out deleted file mode 100644 --- a/monetdb5/modules/mosaic/Tests/mosaic_zone.stable.out +++ /dev/null @@ -1,134 +0,0 @@ -stdout of test 'mosaic_zone` in directory 'monetdb5/modules/mosaic` itself: - - -# 17:24:13 > -# 17:24:13 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=33832" "--set" "mapi_usock=/var/tmp/mtest-18516/.s.monetdb.33832" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/mosaic//Linux/var/MonetDB/mTests_monetdb5_modules_mal" "mosaic_zone.mal" -# 17:24:13 > - -# MonetDB 5 server v11.20.0 -# This is an unreleased version -# Serving database 'mTests_monetdb5_modules_mal', using 8 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit integers dynamically linked -# Found 15.591 GiB available main-memory. -# Copyright (c) 1993-July 2008 CWI. -# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved -# Visit http://www.monetdb.org/ for further information -# Listening for connection requests on mapi:monetdb://vienna.ins.cwi.nl:33832/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-18516/.s.monetdb.33832 -# MonetDB/GIS module loaded -# MonetDB/SQL module loaded -# MonetDB/R module loaded - -# 11:50:48 > -# 11:50:48 > "mclient" "-lmal" "-ftest" "-tnone" "-Eutf-8" "--host=/var/tmp/mtest-30332" "--port=39586" -# 11:50:48 > - -# 15:01:27 > -# 15:01:27 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-15809" "--port=37660" -# 15:01:27 > - -#io.print(base); -#--------------------------# -# h t # name -# void int # type -#--------------------------# -[ 0@0, 50 ] -[ 1@0, 19531015 ] -[ 2@0, 9 ] -[ 3@0, 50 ] -[ 4@0, 19531015 ] -[ 5@0, 9 ] -#zone 1 elms [50 - 50] -#zone 2 elms [50 - 19531015] -#zone 3 elms [9 - 19531015] -#zone 4 elms [9 - 19531015] -#zone 5 elms [9 - 19531015] -#zone 6 elms [9 - 19531015] -#header block 20c7830 version 20140808 -#index top 1 -#[0] 6 144 -#blk type 5 todo 0 -#wins 0 0 0 0 0 1 -#elms 0 0 0 0 0 6 -#time 0 0 0 0 0 0 -#perc 0 0 0 0 0 100 -#zone 6 elms [9 - 19531015] -#--------------------------# -# h t # name -# void int # type -#--------------------------# -[ 0@0, 50 ] -[ 1@0, 19531015 ] -[ 2@0, 9 ] -[ 3@0, 50 ] -[ 4@0, 19531015 ] -[ 5@0, 9 ] -#--------------------------# -# h t # name -# void timestamp # type -#--------------------------# -[ 0@0, 2014-08-14 12:00:00.000000 ] -[ 1@0, 2014-08-14 12:00:00.000000 ] -[ 2@0, 2014-08-14 12:00:00.000000 ] -[ 3@0, 2014-08-14 12:00:00.000000 ] -[ 4@0, 2014-08-14 12:00:00.000000 ] -[ 5@0, 2014-08-14 12:01:00.000000 ] -[ 6@0, 2014-08-14 12:02:00.000000 ] -[ 7@0, 2014-08-14 12:00:00.000000 ] -[ 8@0, 2014-08-14 12:00:00.000000 ] -[ 9@0, 2014-08-14 12:00:00.000000 ] -[ 10@0, 2014-08-14 12:00:00.000000 ] -[ 11@0, 2014-08-14 12:00:00.000000 ] -[ 12@0, 2014-08-14 12:01:00.000000 ] -[ 13@0, 2014-08-14 12:02:00.000000 ] -#--------------------------# -# h t # name -# void timestamp # type -#--------------------------# -[ 0@0, 2014-08-14 12:00:00.000000 ] -[ 1@0, 2014-08-14 12:00:00.000000 ] -[ 2@0, 2014-08-14 12:00:00.000000 ] -[ 3@0, 2014-08-14 12:00:00.000000 ] -[ 4@0, 2014-08-14 12:00:00.000000 ] -[ 5@0, 2014-08-14 12:01:00.000000 ] -[ 6@0, 2014-08-14 12:02:00.000000 ] -[ 7@0, 2014-08-14 12:00:00.000000 ] -[ 8@0, 2014-08-14 12:00:00.000000 ] -[ 9@0, 2014-08-14 12:00:00.000000 ] -[ 10@0, 2014-08-14 12:00:00.000000 ] -[ 11@0, 2014-08-14 12:00:00.000000 ] -[ 12@0, 2014-08-14 12:01:00.000000 ] -[ 13@0, 2014-08-14 12:02:00.000000 ] -#--------------------------# -# h t # name -# void date # type -#--------------------------# -[ 0@0, 2014-08-14 ] -[ 1@0, 2014-08-14 ] -[ 2@0, 2014-08-14 ] -[ 3@0, 2014-08-14 ] -[ 4@0, 2014-08-15 ] -[ 5@0, 2014-08-14 ] -[ 6@0, 2014-08-14 ] -[ 7@0, 2014-08-14 ] -[ 8@0, 2014-08-14 ] -[ 9@0, 2014-08-15 ] -#--------------------------# -# h t # name -# void date # type -#--------------------------# -[ 0@0, 2014-08-14 ] -[ 1@0, 2014-08-14 ] -[ 2@0, 2014-08-14 ] -[ 3@0, 2014-08-14 ] -[ 4@0, 2014-08-15 ] -[ 5@0, 2014-08-14 ] -[ 6@0, 2014-08-14 ] -[ 7@0, 2014-08-14 ] -[ 8@0, 2014-08-14 ] -[ 9@0, 2014-08-15 ] - -# 17:24:13 > -# 17:24:13 > "Done." -# 17:24:13 > - diff --git a/monetdb5/modules/mosaic/Tests/mosaic_zone_joins.malC b/monetdb5/modules/mosaic/Tests/mosaic_zone_joins.malC deleted file mode 100644 --- a/monetdb5/modules/mosaic/Tests/mosaic_zone_joins.malC +++ /dev/null @@ -1,41 +0,0 @@ -# Compression of noncompressable column - -b:= bat.new(:int); -bat.append(b,50); -bat.append(b,19531015); -bat.append(b,9); -b:= bat.append(b,b); -base:= algebra.copy(b); - -io.print(base); -mosaic.compress(b,"zone"); - -c:= bat.new(:oid); -bat.append(c,0@0); -bat.append(c,2@0); -bat.append(c,5@0); -io.print(c); - -s:= algebra.projection(c,base); -io.print(s); -xs:= mosaic.projection(c,b); -io.print(xs); - -d:= bat.new(:int); -bat.append(d,9); -bat.append(d,11); -bat.append(d,nil:int); - -(jl,jr):= algebra.join(base,d, nil:bat, nil:bat, false, 0:lng); -io.print(jl,jr); -(ml,mr):= mosaic.join(b,d, nil:bat, nil:bat, false, 0:lng); -io.print(ml,mr); - -(jl,jr):= algebra.join(d,base, nil:bat, nil:bat, false, 0:lng); -io.print(jl); -io.print(jr); -io.print(jl,jr); -(ml,mr):= mosaic.join(d,b, nil:bat, nil:bat, false, 0:lng); -io.print(ml); -io.print(mr); -io.print(ml,mr); diff --git a/monetdb5/modules/mosaic/Tests/mosaic_zone_joins.stable.err b/monetdb5/modules/mosaic/Tests/mosaic_zone_joins.stable.err deleted file mode 100644 _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
