Changeset: 23c462e5486f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=23c462e5486f
Added Files:
monetdb5/modules/mal/Tests/mosaic_mix.mal
monetdb5/modules/mal/Tests/mosaic_mix.stable.err
monetdb5/modules/mal/Tests/mosaic_mix.stable.out
monetdb5/modules/mal/Tests/mosaic_none.mal
monetdb5/modules/mal/Tests/mosaic_none.stable.err
monetdb5/modules/mal/Tests/mosaic_none.stable.out
monetdb5/modules/mal/Tests/mosaic_rle.mal
monetdb5/modules/mal/Tests/mosaic_rle.stable.err
monetdb5/modules/mal/Tests/mosaic_rle.stable.out
sql/test/mosaic/Tests/All
sql/test/mosaic/Tests/compression.sql
sql/test/mosaic/Tests/warnings.sql
sql/test/mosaic/Tests/warnings.stable.err
sql/test/mosaic/Tests/warnings.stable.out
Modified Files:
monetdb5/modules/mal/Makefile.ag
monetdb5/modules/mal/Tests/All
sql/scripts/Makefile.ag
Branch: mosaic
Log Message:
Additional mosaic tests
diffs (truncated from 1779 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
@@ -17,6 +17,7 @@
INCLUDES = ../../mal ../atoms ../kernel \
../../../clients/mapilib \
+ ../../../monetdb5/optimizer \
../../../common/options \
../../../common/stream \
../../../common/utils \
@@ -60,6 +61,7 @@ lib_mal = {
zorder.c zorder.h \
sample.c sample.h \
json_util.c json_util.h \
+ mosaic.c mosaic.h \
calc.c batcalc.c
}
@@ -75,7 +77,7 @@ headers_mal = {
mal_mapi.mal sabaoth.mal remote.mal \
txtsim.mal recycle.mal \
cluster.mal trader.mal \
- tokenizer.mal zorder.mal sample.mal json_util.mal \
+ tokenizer.mal zorder.mal sample.mal json_util.mal mosaic.mal \
calc.mal batcalc.mal batmtime.mal querylog.mal sysmon.mal
}
@@ -83,7 +85,7 @@ EXTRA_DIST = batExtensions.mal iterator.
groupby.mal mal_init.mal manual.mal mkey.mal manifold.mal pcre.mal \
profiler.mal recycle.mal remote.mal sabaoth.mal trader.mal \
transaction.mal txtsim.mal tablet.mal tablet.h sample.mal json_util.mal
\
- mal_mapi.mal mat.mal tokenizer.mal calc.mal \
- batcalc.mal batmtime.mal querylog.mal sysmon.mal
+ mal_mapi.mal mat.mal tokenizer.mal calc.mal
+ batcalc.mal batmtime.mal querylog.mal sysmon.mal mosaic.mal
EXTRA_DIST_DIR = Tests
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
@@ -9,7 +9,6 @@ inspect00
inspect05
inspect10
#inspect40 word size problems on different platforms
-
register00
mserver00
@@ -18,13 +17,13 @@ qgram
groupby00
+
imprints
call00
callstring
callfunction
-
#ascii_io2 needs work
mat
@@ -67,7 +66,10 @@ zorder
manifold
manifoldstr
-#manifoldaggr
+
+mosaic_none
+mosaic_rle
+mosaic_mix
#HAVE_RAPTOR?rdf
diff --git a/monetdb5/modules/mal/Tests/mosaic_mix.mal
b/monetdb5/modules/mal/Tests/mosaic_mix.mal
new file mode 100644
--- /dev/null
+++ b/monetdb5/modules/mal/Tests/mosaic_mix.mal
@@ -0,0 +1,102 @@
+# OID list compressions
+
+o := 19531025:int;
+
+b:= bat.new(:oid,:int);
+bat.append(b,0);
+bat.append(b,1);
+bat.append(b,2);
+bat.append(b,3);
+bat.append(b,5);
+bat.append(b,7);
+bat.append(b,70);
+bat.append(b,188);
+bat.append(b,190);
+bat.append(b,192);
+bat.append(b,9999);
+bat.append(b,50);
+bat.append(b,49);
+bat.append(b,50);
+bat.append(b,50);
+bat.append(b,48);
+bat.append(b,1003);
+bat.append(b,1002);
+bat.append(b,1001);
+bat.append(b,1000);
+bat.append(b,95);
+bat.append(b,99);
+bat.append(b,96);
+bat.append(b,98);
+bat.append(b,97);
+bat.append(b,94);
+bat.append(b,90);
+bat.append(b,93);
+bat.append(b,91);
+bat.append(b,92);
+bat.append(b,1140);
+bat.append(b,1130);
+bat.append(b,1120);
+bat.append(b,1110);
+bat.append(b,1100);
+bat.append(b,1250);
+bat.append(b,1260);
+bat.append(b,1270);
+bat.append(b,1280);
+bat.append(b,1290);
+bat.append(b,o);
+bat.append(b,o);
+bat.append(b,o);
+bat.append(b,o);
+bat.append(b,o);
+bat.append(b,o);
+bat.append(b,o);
+bat.append(b,o);
+bat.append(b,o);
+bat.append(b,o);
+bat.append(b,o);
+bat.append(b,o);
+bat.append(b,o);
+bat.append(b,o);
+bat.append(b,o);
+bat.append(b,o);
+bat.append(b,o);
+bat.append(b,o);
+bat.append(b,o);
+bat.append(b,o);
+bat.append(b,9);
+bat.append(b,9);
+bat.append(b,9);
+bat.append(b,9);
+bat.append(b,9);
+bat.append(b,9);
+bat.append(b,9);
+bat.append(b,9);
+bat.append(b,9);
+bat.append(b,9);
+bat.append(b,9);
+bat.append(b,9);
+bat.append(b,9);
+bat.append(b,9);
+bat.append(b,9);
+bat.append(b,9);
+bat.append(b,9);
+bat.append(b,9);
+bat.append(b,9);
+bat.append(b,9);
+bat.append(b,9);
+bat.append(b,9);
+bat.append(b,9);
+bat.append(b,9);
+bat.append(b,9);
+bat.append(b,9);
+bat.append(b,9);
+bat.append(b,9);
+bat.append(b,9);
+bat.append(b,9);
+b:= bat.append(b,b);
+
+io.print(b);
+x:= mosaic.compress(b);
+mosaic.dump(x);
+z:= mosaic.decompress(x);
+io.print(z);
diff --git a/monetdb5/modules/mal/Tests/mosaic_mix.stable.err
b/monetdb5/modules/mal/Tests/mosaic_mix.stable.err
new file mode 100644
--- /dev/null
+++ b/monetdb5/modules/mal/Tests/mosaic_mix.stable.err
@@ -0,0 +1,30 @@
+stderr of test 'mosaic_mix` in directory 'monetdb5/modules/mal` itself:
+
+
+# 20:55:33 >
+# 20:55:33 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=37588" "--set"
"mapi_usock=/var/tmp/mtest-15513/.s.monetdb.37588" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/mosaic//Linux/var/MonetDB/mTests_monetdb5_modules_mal"
"mosaic_mix.mal"
+# 20:55:33 >
+
+# 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 = 37588
+# cmdline opt mapi_usock = /var/tmp/mtest-15513/.s.monetdb.37588
+# 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
+
+# 20:55:33 >
+# 20:55:33 > "Done."
+# 20:55:33 >
+
diff --git a/monetdb5/modules/mal/Tests/mosaic_mix.stable.out
b/monetdb5/modules/mal/Tests/mosaic_mix.stable.out
new file mode 100644
--- /dev/null
+++ b/monetdb5/modules/mal/Tests/mosaic_mix.stable.out
@@ -0,0 +1,673 @@
+stdout of test 'mosaic_mix` in directory 'monetdb5/modules/mal` itself:
+
+
+# 20:55:33 >
+# 20:55:33 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=37588" "--set"
"mapi_usock=/var/tmp/mtest-15513/.s.monetdb.37588" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/mosaic//Linux/var/MonetDB/mTests_monetdb5_modules_mal"
"mosaic_mix.mal"
+# 20:55:33 >
+
+# MonetDB 5 server v11.18.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 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:37588/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-15513/.s.monetdb.37588
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+function user.main():void;
+# OID list compressions
+ o := 19531025:int;
+ b := bat.new(:oid,:int);
+ bat.append(b,0);
+ bat.append(b,1);
+ bat.append(b,2);
+ bat.append(b,3);
+ bat.append(b,5);
+ bat.append(b,7);
+ bat.append(b,70);
+ bat.append(b,188);
+ bat.append(b,190);
+ bat.append(b,192);
+ bat.append(b,9999);
+ bat.append(b,50);
+ bat.append(b,49);
+ bat.append(b,50);
+ bat.append(b,50);
+ bat.append(b,48);
+ bat.append(b,1003);
+ bat.append(b,1002);
+ bat.append(b,1001);
+ bat.append(b,1000);
+ bat.append(b,95);
+ bat.append(b,99);
+ bat.append(b,96);
+ bat.append(b,98);
+ bat.append(b,97);
+ bat.append(b,94);
+ bat.append(b,90);
+ bat.append(b,93);
+ bat.append(b,91);
+ bat.append(b,92);
+ bat.append(b,1140);
+ bat.append(b,1130);
+ bat.append(b,1120);
+ bat.append(b,1110);
+ bat.append(b,1100);
+ bat.append(b,1250);
+ bat.append(b,1260);
+ bat.append(b,1270);
+ bat.append(b,1280);
+ bat.append(b,1290);
+ bat.append(b,o);
+ bat.append(b,o);
+ bat.append(b,o);
+ bat.append(b,o);
+ bat.append(b,o);
+ bat.append(b,o);
+ bat.append(b,o);
+ bat.append(b,o);
+ bat.append(b,o);
+ bat.append(b,o);
+ bat.append(b,o);
+ bat.append(b,o);
+ bat.append(b,o);
+ bat.append(b,o);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
