Changeset: bddbcb8a013d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bddbcb8a013d
Added Files:
monetdb5/modules/mal/Tests/mosaic_frame.mal
monetdb5/modules/mal/Tests/mosaic_frame.stable.err
monetdb5/modules/mal/Tests/mosaic_frame.stable.out
Removed Files:
monetdb5/modules/mal/mosaic_variance.c
monetdb5/modules/mal/mosaic_variance.h
monetdb5/modules/mal/mosaic_zone.c
monetdb5/modules/mal/mosaic_zone.h
Modified Files:
monetdb5/modules/mal/Makefile.ag
monetdb5/modules/mal/Tests/All
monetdb5/modules/mal/Tests/mosaic_dictionary.mal
monetdb5/modules/mal/Tests/mosaic_dictionary.stable.out
monetdb5/modules/mal/Tests/mosaic_mix_joins.mal
monetdb5/modules/mal/Tests/mosaic_mix_joins.stable.out
monetdb5/modules/mal/Tests/mosaic_prefix.mal
monetdb5/modules/mal/Tests/mosaic_prefix.stable.out
monetdb5/modules/mal/Tests/mosaic_runlength.mal
monetdb5/modules/mal/Tests/mosaic_runlength.stable.out
monetdb5/modules/mal/mosaic.c
monetdb5/modules/mal/mosaic.h
monetdb5/modules/mal/mosaic_delta.c
monetdb5/modules/mal/mosaic_dictionary.c
monetdb5/modules/mal/mosaic_hdr.c
monetdb5/modules/mal/mosaic_linear.c
monetdb5/modules/mal/mosaic_literal.c
monetdb5/modules/mal/mosaic_prefix.c
monetdb5/modules/mal/mosaic_runlength.c
sql/scripts/Makefile.ag
Branch: mosaic
Log Message:
Prepare the adminstration for repeated calls
The old code moved the src pointer around,
it is easier to manipulate using oid ranges.
diffs (truncated from 3782 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
@@ -67,10 +67,9 @@ lib_mal = {
mosaic_literal.c mosaic_literal.h \
mosaic_runlength.c mosaic_runlength.h \
mosaic_dictionary.c mosaic_dictionary.h \
- mosaic_zone.c mosaic_zone.h \
mosaic_delta.c mosaic_delta.h \
mosaic_linear.c mosaic_linear.h \
- mosaic_variance.c mosaic_variance.h \
+ mosaic_frame.c mosaic_frame.h \
mosaic_prefix.c mosaic_prefix.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
@@ -76,6 +76,7 @@ mosaic_zone
mosaic_delta
mosaic_linear
mosaic_prefix
+mosaic_frame
mosaic_literal_double
diff --git a/monetdb5/modules/mal/Tests/mosaic_dictionary.mal
b/monetdb5/modules/mal/Tests/mosaic_dictionary.mal
--- a/monetdb5/modules/mal/Tests/mosaic_dictionary.mal
+++ b/monetdb5/modules/mal/Tests/mosaic_dictionary.mal
@@ -22,7 +22,7 @@ bat.append(d,"2014-08-15":date);
d:= bat.append(d,d);
io.print(d);
-xd:= mosaic.compress(d,"dictionary test 100");
+xd:= mosaic.compress(d,"dictionary");
#mosaic.dump(xd);
zd:= mosaic.decompress(xd);
io.print(zd);
diff --git a/monetdb5/modules/mal/Tests/mosaic_dictionary.stable.out
b/monetdb5/modules/mal/Tests/mosaic_dictionary.stable.out
--- a/monetdb5/modules/mal/Tests/mosaic_dictionary.stable.out
+++ b/monetdb5/modules/mal/Tests/mosaic_dictionary.stable.out
@@ -39,7 +39,7 @@ function user.main():void;
bat.append(d,"2014-08-15":date);
d := bat.append(d,d);
io.print(d);
- xd := mosaic.compress(d,"dictionary test 100");
+ xd := mosaic.compress(d,"dictionary");
#mosaic.dump(xd);
zd := mosaic.decompress(xd);
io.print(zd);
diff --git a/monetdb5/modules/mal/Tests/mosaic_frame.mal
b/monetdb5/modules/mal/Tests/mosaic_frame.mal
new file mode 100644
--- /dev/null
+++ b/monetdb5/modules/mal/Tests/mosaic_frame.mal
@@ -0,0 +1,28 @@
+b:= bat.new(:oid,:timestamp);
+bat.append(b,"2014-08-14 12:00:00":timestamp);
+bat.append(b,"2014-08-14 12:00:00":timestamp);
+bat.append(b,"2014-08-14 12:01:00":timestamp);
+bat.append(b,"2014-08-14 12:02:00":timestamp);
+bat.append(b,"2014-08-14 12:00:00":timestamp);
+b:= bat.append(b,b);
+base:= algebra.copy(b);
+
+io.print(base);
+x:= mosaic.compress(b,"frame");
+#mosaic.dump(x);
+z:= mosaic.decompress(x);
+io.print(z);
+
+d:= bat.new(:oid,: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);
+xd:= mosaic.compress(d,"frame");
+#mosaic.dump(xd);
+zd:= mosaic.decompress(xd);
+io.print(zd);
diff --git a/monetdb5/modules/mal/Tests/mosaic_frame.stable.err
b/monetdb5/modules/mal/Tests/mosaic_frame.stable.err
new file mode 100644
--- /dev/null
+++ b/monetdb5/modules/mal/Tests/mosaic_frame.stable.err
@@ -0,0 +1,30 @@
+stderr of test 'mosaic_frame` in directory 'monetdb5/modules/mal` itself:
+
+
+# 07:42:13 >
+# 07:42:13 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30639" "--set"
"mapi_usock=/var/tmp/mtest-1108/.s.monetdb.30639" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/mosaic//Linux/var/MonetDB/mTests_monetdb5_modules_mal"
"mosaic_frame.mal"
+# 07:42: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 = 30639
+# cmdline opt mapi_usock = /var/tmp/mtest-1108/.s.monetdb.30639
+# 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
+
+# 07:42:13 >
+# 07:42:13 > "Done."
+# 07:42:13 >
+
diff --git a/monetdb5/modules/mal/Tests/mosaic_frame.stable.out
b/monetdb5/modules/mal/Tests/mosaic_frame.stable.out
new file mode 100644
--- /dev/null
+++ b/monetdb5/modules/mal/Tests/mosaic_frame.stable.out
@@ -0,0 +1,107 @@
+stdout of test 'mosaic_frame` in directory 'monetdb5/modules/mal` itself:
+
+
+# 07:42:13 >
+# 07:42:13 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30639" "--set"
"mapi_usock=/var/tmp/mtest-1108/.s.monetdb.30639" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/mosaic//Linux/var/MonetDB/mTests_monetdb5_modules_mal"
"mosaic_frame.mal"
+# 07:42: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.590 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:30639/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-1108/.s.monetdb.30639
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+function user.main():void;
+ b := bat.new(:oid,:timestamp);
+ bat.append(b,"2014-08-14 12:00:00.000":timestamp);
+ bat.append(b,"2014-08-14 12:00:00.000":timestamp);
+ bat.append(b,"2014-08-14 12:01:00.000":timestamp);
+ bat.append(b,"2014-08-14 12:02:00.000":timestamp);
+ bat.append(b,"2014-08-14 12:00:00.000":timestamp);
+ b := bat.append(b,b);
+ base := algebra.copy(b);
+ io.print(base);
+ x := mosaic.compress(b,"frame");
+#mosaic.dump(x);
+ z := mosaic.decompress(x);
+ io.print(z);
+ d := bat.new(:oid,: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);
+ xd := mosaic.compress(d,"frame");
+#mosaic.dump(xd);
+ zd := mosaic.decompress(xd);
+ io.print(zd);
+end main;
+#--------------------------#
+# h t # name
+# void timestamp # type
+#--------------------------#
+[ 0@0, 2014-08-14 12:00:00.000 ]
+[ 1@0, 2014-08-14 12:00:00.000 ]
+[ 2@0, 2014-08-14 12:01:00.000 ]
+[ 3@0, 2014-08-14 12:02:00.000 ]
+[ 4@0, 2014-08-14 12:00:00.000 ]
+[ 5@0, 2014-08-14 12:00:00.000 ]
+[ 6@0, 2014-08-14 12:00:00.000 ]
+[ 7@0, 2014-08-14 12:01:00.000 ]
+[ 8@0, 2014-08-14 12:02:00.000 ]
+[ 9@0, 2014-08-14 12:00:00.000 ]
+#--------------------------#
+# h t # name
+# void timestamp # type
+#--------------------------#
+[ 0@0, 2014-08-14 12:00:00.000 ]
+[ 1@0, 2014-08-14 12:00:00.000 ]
+[ 2@0, 2014-08-14 12:01:00.000 ]
+[ 3@0, 2014-08-14 12:02:00.000 ]
+[ 4@0, 2014-08-14 12:00:00.000 ]
+[ 5@0, 2014-08-14 12:00:00.000 ]
+[ 6@0, 2014-08-14 12:00:00.000 ]
+[ 7@0, 2014-08-14 12:01:00.000 ]
+[ 8@0, 2014-08-14 12:02:00.000 ]
+[ 9@0, 2014-08-14 12:00:00.000 ]
+#--------------------------#
+# 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 ]
+
+# 07:42:13 >
+# 07:42:13 > "Done."
+# 07:42:13 >
+
diff --git a/monetdb5/modules/mal/Tests/mosaic_mix_joins.mal
b/monetdb5/modules/mal/Tests/mosaic_mix_joins.mal
--- a/monetdb5/modules/mal/Tests/mosaic_mix_joins.mal
+++ b/monetdb5/modules/mal/Tests/mosaic_mix_joins.mal
@@ -23,7 +23,7 @@ bat.append(b,9);
base:=algebra.copy(b);
io.print(base);
-x:= mosaic.compress(b);
+x:= mosaic.compress(b,"runlength dictionary delta linear frame");
mosaic.dump(x);
c:= bat.new(:oid,:oid);
diff --git a/monetdb5/modules/mal/Tests/mosaic_mix_joins.stable.out
b/monetdb5/modules/mal/Tests/mosaic_mix_joins.stable.out
--- a/monetdb5/modules/mal/Tests/mosaic_mix_joins.stable.out
+++ b/monetdb5/modules/mal/Tests/mosaic_mix_joins.stable.out
@@ -40,7 +40,7 @@ function user.main():void;
bat.append(b,9);
base := algebra.copy(b);
io.print(base);
- x := mosaic.compress(b);
+ x := mosaic.compress(b,"runlength dictionary delta linear frame");
mosaic.dump(x);
c := bat.new(:oid,:oid);
bat.append(c,0@0);
diff --git a/monetdb5/modules/mal/Tests/mosaic_prefix.mal
b/monetdb5/modules/mal/Tests/mosaic_prefix.mal
--- a/monetdb5/modules/mal/Tests/mosaic_prefix.mal
+++ b/monetdb5/modules/mal/Tests/mosaic_prefix.mal
@@ -60,6 +60,7 @@ bat.append(c,255:sht);
bat.append(c,255:sht);
bat.append(c,255:sht);
+io.print(c);
xc:= mosaic.compress(c,"prefix");
#mosaic.dump(xc);
zc:= mosaic.decompress(xc);
diff --git a/monetdb5/modules/mal/Tests/mosaic_prefix.stable.out
b/monetdb5/modules/mal/Tests/mosaic_prefix.stable.out
--- a/monetdb5/modules/mal/Tests/mosaic_prefix.stable.out
+++ b/monetdb5/modules/mal/Tests/mosaic_prefix.stable.out
@@ -77,6 +77,7 @@ function user.main():void;
bat.append(c,255:sht);
bat.append(c,255:sht);
bat.append(c,255:sht);
+ io.print(c);
xc := mosaic.compress(c,"prefix");
#mosaic.dump(xc);
zc := mosaic.decompress(xc);
@@ -172,6 +173,36 @@ end main;
[ 23@0, 255 ]
[ 24@0, 255 ]
[ 25@0, 255 ]
+#--------------------------#
+# h t # name
+# void sht # type
+#--------------------------#
+[ 0@0, 50 ]
+[ 1@0, 51 ]
+[ 2@0, 51 ]
+[ 3@0, 51 ]
+[ 4@0, 51 ]
+[ 5@0, 51 ]
+[ 6@0, 51 ]
+[ 7@0, 60 ]
+[ 8@0, 67 ]
+[ 9@0, 67 ]
+[ 10@0, 67 ]
+[ 11@0, 67 ]
+[ 12@0, 67 ]
+[ 13@0, 67 ]
+[ 14@0, 67 ]
+[ 15@0, 255 ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
