Changeset: cdb4f4f8b858 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cdb4f4f8b858
Added Files:
monetdb5/modules/mal/Tests/mosaic_delta.mal
monetdb5/modules/mal/Tests/mosaic_delta.stable.err
monetdb5/modules/mal/Tests/mosaic_delta.stable.out
monetdb5/modules/mal/Tests/mosaic_delta_joins.mal
monetdb5/modules/mal/Tests/mosaic_delta_joins.stable.err
monetdb5/modules/mal/Tests/mosaic_delta_joins.stable.out
monetdb5/modules/mal/Tests/mosaic_delta_subselect.mal
monetdb5/modules/mal/Tests/mosaic_delta_subselect.stable.err
monetdb5/modules/mal/Tests/mosaic_delta_subselect.stable.out
monetdb5/modules/mal/Tests/mosaic_delta_thetasubselect.mal
monetdb5/modules/mal/Tests/mosaic_delta_thetasubselect.stable.err
monetdb5/modules/mal/Tests/mosaic_delta_thetasubselect.stable.out
monetdb5/modules/mal/mosaic_delta.c
monetdb5/modules/mal/mosaic_delta.h
Modified Files:
monetdb5/modules/mal/Makefile.ag
monetdb5/modules/mal/Tests/All
monetdb5/modules/mal/mosaic.c
Branch: mosaic
Log Message:
Delta compression (theta)subselect and (leftfetch)join
diffs (truncated from 2109 to 300 lines):
diff --git a/monetdb5/modules/mal/Makefile.ag b/monetdb5/modules/mal/Makefile.ag
--- a/monetdb5/modules/mal/Makefile.ag
+++ b/monetdb5/modules/mal/Makefile.ag
@@ -68,6 +68,7 @@ lib_mal = {
mosaic_rle.c mosaic_rle.h \
mosaic_dict.c mosaic_dict.h \
mosaic_zone.c mosaic_zone.h \
+ mosaic_delta.c mosaic_delta.h \
calc.c batcalc.c
}
diff --git a/monetdb5/modules/mal/Tests/All b/monetdb5/modules/mal/Tests/All
--- a/monetdb5/modules/mal/Tests/All
+++ b/monetdb5/modules/mal/Tests/All
@@ -72,6 +72,7 @@ mosaic_rle
mosaic_mix
mosaic_dict
mosaic_zone
+mosaic_delta
mosaic_none_double
@@ -79,18 +80,21 @@ mosaic_none_subselect
mosaic_rle_subselect
mosaic_dict_subselect
mosaic_zone_subselect
+mosaic_delta_subselect
mosaic_mix_subselect
mosaic_none_thetasubselect
mosaic_rle_thetasubselect
mosaic_dict_thetasubselect
mosaic_zone_thetasubselect
+mosaic_delta_thetasubselect
mosaic_mix_thetasubselect
mosaic_none_joins
mosaic_rle_joins
mosaic_dict_joins
mosaic_zone_joins
+mosaic_delta_joins
mosaic_mix_joins
#HAVE_RAPTOR?rdf
diff --git a/monetdb5/modules/mal/Tests/mosaic_delta.mal
b/monetdb5/modules/mal/Tests/mosaic_delta.mal
new file mode 100644
--- /dev/null
+++ b/monetdb5/modules/mal/Tests/mosaic_delta.mal
@@ -0,0 +1,18 @@
+# Delta compression
+b:= bat.new(:oid,:int);
+bat.append(b,0);
+bat.append(b,1);
+bat.append(b,4);
+bat.append(b,-1);
+bat.append(b,-3);
+bat.append(b,1000);
+bat.append(b,1001);
+bat.append(b,1004);
+bat.append(b,999);
+bat.append(b,977);
+
+io.print(b);
+x:= mosaic.compress(b,"delta");
+#mosaic.dump(x);
+z:= mosaic.decompress(x);
+io.print(z);
diff --git a/monetdb5/modules/mal/Tests/mosaic_delta.stable.err
b/monetdb5/modules/mal/Tests/mosaic_delta.stable.err
new file mode 100644
--- /dev/null
+++ b/monetdb5/modules/mal/Tests/mosaic_delta.stable.err
@@ -0,0 +1,30 @@
+stderr of test 'mosaic_delta` in directory 'monetdb5/modules/mal` itself:
+
+
+# 19:05:34 >
+# 19:05:34 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38017" "--set"
"mapi_usock=/var/tmp/mtest-21014/.s.monetdb.38017" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/mosaic//Linux/var/MonetDB/mTests_monetdb5_modules_mal"
"mosaic_delta.mal"
+# 19:05:34 >
+
+# 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 = 38017
+# cmdline opt mapi_usock = /var/tmp/mtest-21014/.s.monetdb.38017
+# 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
+
+# 19:05:35 >
+# 19:05:35 > "Done."
+# 19:05:35 >
+
diff --git a/monetdb5/modules/mal/Tests/mosaic_delta.stable.out
b/monetdb5/modules/mal/Tests/mosaic_delta.stable.out
new file mode 100644
--- /dev/null
+++ b/monetdb5/modules/mal/Tests/mosaic_delta.stable.out
@@ -0,0 +1,83 @@
+stdout of test 'mosaic_delta` in directory 'monetdb5/modules/mal` itself:
+
+
+# 19:05:34 >
+# 19:05:34 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38017" "--set"
"mapi_usock=/var/tmp/mtest-21014/.s.monetdb.38017" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/mosaic//Linux/var/MonetDB/mTests_monetdb5_modules_mal"
"mosaic_delta.mal"
+# 19:05:34 >
+
+# 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:38017/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-21014/.s.monetdb.38017
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+function user.main():void;
+# Delta compression
+ b := bat.new(:oid,:int);
+ bat.append(b,0);
+ bat.append(b,1);
+ bat.append(b,4);
+ bat.append(b,-1);
+ bat.append(b,-3);
+ bat.append(b,1000);
+ bat.append(b,1001);
+ bat.append(b,1004);
+ bat.append(b,999);
+ bat.append(b,977);
+ io.print(b);
+ x := mosaic.compress(b,"delta");
+#mosaic.dump(x);
+ z := mosaic.decompress(x);
+ io.print(z);
+end main;
+#--------------------------#
+# h t # name
+# void int # type
+#--------------------------#
+[ 0@0, 0 ]
+[ 1@0, 1 ]
+[ 2@0, 4 ]
+[ 3@0, -1 ]
+[ 4@0, -3 ]
+[ 5@0, 1000 ]
+[ 6@0, 1001 ]
+[ 7@0, 1004 ]
+[ 8@0, 999 ]
+[ 9@0, 977 ]
+#header block 1bb4830 version 20140808
+#index top 1
+#[0] 5 96
+#header block 1bb4830 version 20140808
+#index top 2
+#[0] 5 96
+#[1] 10 120
+#blk type 5 todo 0
+#wins 0 0 0 2 0 0
+#elms 0 0 0 10 0 0
+#time 0 0 0 0 0 0
+#perc 0 0 0 100 0 0
+#--------------------------#
+# h t # name
+# void int # type
+#--------------------------#
+[ 0@0, 0 ]
+[ 1@0, 1 ]
+[ 2@0, 4 ]
+[ 3@0, -1 ]
+[ 4@0, -3 ]
+[ 5@0, 1000 ]
+[ 6@0, 1001 ]
+[ 7@0, 1004 ]
+[ 8@0, 999 ]
+[ 9@0, 977 ]
+
+# 19:05:35 >
+# 19:05:35 > "Done."
+# 19:05:35 >
+
diff --git a/monetdb5/modules/mal/Tests/mosaic_delta_joins.mal
b/monetdb5/modules/mal/Tests/mosaic_delta_joins.mal
new file mode 100644
--- /dev/null
+++ b/monetdb5/modules/mal/Tests/mosaic_delta_joins.mal
@@ -0,0 +1,42 @@
+# Delta compression
+b:= bat.new(:oid,:int);
+bat.append(b,0);
+bat.append(b,1);
+bat.append(b,4);
+bat.append(b,-1);
+bat.append(b,-3);
+bat.append(b,1000);
+bat.append(b,1001);
+bat.append(b,1004);
+bat.append(b,999);
+bat.append(b,977);
+
+io.print(b);
+x:= mosaic.compress(b,"delta");
+
+c:= bat.new(:oid,:oid);
+bat.append(c,0@0);
+bat.append(c,2@0);
+bat.append(c,5@0);
+io.print(c);
+
+#mosaic.dump(x);
+s:= algebra.leftfetchjoin(c,b);
+io.print(s);
+xs:= mosaic.leftfetchjoin(c,b);
+io.print(xs);
+
+d:= bat.new(:oid,:int);
+bat.append(d,4);
+bat.append(d,-1);
+bat.append(d,nil:int);
+
+(jl,jr):= algebra.join(b,d);
+io.print(jl,jr);
+(ml,mr):= mosaic.join(x,d);
+io.print(ml,mr);
+
+(jl,jr):= algebra.join(d,b);
+io.print(jl,jr);
+(ml,mr):= mosaic.join(d,x);
+io.print(ml,mr);
diff --git a/monetdb5/modules/mal/Tests/mosaic_delta_joins.stable.err
b/monetdb5/modules/mal/Tests/mosaic_delta_joins.stable.err
new file mode 100644
--- /dev/null
+++ b/monetdb5/modules/mal/Tests/mosaic_delta_joins.stable.err
@@ -0,0 +1,30 @@
+stderr of test 'mosaic_delta_joins` in directory 'monetdb5/modules/mal` itself:
+
+
+# 19:38:40 >
+# 19:38:40 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30180" "--set"
"mapi_usock=/var/tmp/mtest-26536/.s.monetdb.30180" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/mosaic//Linux/var/MonetDB/mTests_monetdb5_modules_mal"
"mosaic_delta_joins.mal"
+# 19:38:40 >
+
+# 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 = 30180
+# cmdline opt mapi_usock = /var/tmp/mtest-26536/.s.monetdb.30180
+# 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
+
+# 19:38:40 >
+# 19:38:40 > "Done."
+# 19:38:40 >
+
diff --git a/monetdb5/modules/mal/Tests/mosaic_delta_joins.stable.out
b/monetdb5/modules/mal/Tests/mosaic_delta_joins.stable.out
new file mode 100644
--- /dev/null
+++ b/monetdb5/modules/mal/Tests/mosaic_delta_joins.stable.out
@@ -0,0 +1,129 @@
+stdout of test 'mosaic_delta_joins` in directory 'monetdb5/modules/mal` itself:
+
+
+# 19:38:40 >
+# 19:38:40 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30180" "--set"
"mapi_usock=/var/tmp/mtest-26536/.s.monetdb.30180" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/mosaic//Linux/var/MonetDB/mTests_monetdb5_modules_mal"
"mosaic_delta_joins.mal"
+# 19:38:40 >
+
+# 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:30180/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-26536/.s.monetdb.30180
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+function user.main():void;
+# Delta compression
+ b := bat.new(:oid,:int);
+ bat.append(b,0);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
