Changeset: 0efcf2e779e5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0efcf2e779e5
Modified Files:
monetdb5/modules/mal/Tests/mosaic_delta.mal
monetdb5/modules/mal/Tests/mosaic_delta.stable.out
monetdb5/modules/mal/Tests/mosaic_linear.mal
monetdb5/modules/mal/Tests/mosaic_linear.stable.out
monetdb5/modules/mal/Tests/mosaic_runlength.mal
monetdb5/modules/mal/Tests/mosaic_runlength.stable.out
monetdb5/modules/mal/Tests/mosaic_zone.mal
monetdb5/modules/mal/Tests/mosaic_zone.stable.out
Branch: mosaic
Log Message:
Accept output
diffs (truncated from 513 to 300 lines):
diff --git a/monetdb5/modules/mal/Tests/mosaic_delta.mal
b/monetdb5/modules/mal/Tests/mosaic_delta.mal
--- a/monetdb5/modules/mal/Tests/mosaic_delta.mal
+++ b/monetdb5/modules/mal/Tests/mosaic_delta.mal
@@ -20,9 +20,11 @@ io.print(z);
bs:= bat.new(:oid,: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);
-bat.append(bs,"2014-08-14 12:00:00":timestamp);
bs:= bat.append(bs,bs);
io.print(bs);
diff --git a/monetdb5/modules/mal/Tests/mosaic_delta.stable.out
b/monetdb5/modules/mal/Tests/mosaic_delta.stable.out
--- a/monetdb5/modules/mal/Tests/mosaic_delta.stable.out
+++ b/monetdb5/modules/mal/Tests/mosaic_delta.stable.out
@@ -38,9 +38,11 @@ function user.main():void;
bs := bat.new(:oid,:timestamp);
bat.append(bs,"2014-08-14 12:00:00.000":timestamp);
bat.append(bs,"2014-08-14 12:00:00.000":timestamp);
+ bat.append(bs,"2014-08-14 12:00:00.000":timestamp);
+ bat.append(bs,"2014-08-14 12:00:00.000":timestamp);
+ bat.append(bs,"2014-08-14 12:00:00.000":timestamp);
bat.append(bs,"2014-08-14 12:01:00.000":timestamp);
bat.append(bs,"2014-08-14 12:02:00.000":timestamp);
- bat.append(bs,"2014-08-14 12:00:00.000":timestamp);
bs := bat.append(bs,bs);
io.print(bs);
xs := mosaic.compress(bs,"delta");
@@ -106,29 +108,36 @@ end main;
#--------------------------#
[ 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 ]
+[ 2@0, 2014-08-14 12:00:00.000 ]
+[ 3@0, 2014-08-14 12:00: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 ]
+[ 5@0, 2014-08-14 12:01:00.000 ]
+[ 6@0, 2014-08-14 12:02:00.000 ]
+[ 7@0, 2014-08-14 12:00:00.000 ]
+[ 8@0, 2014-08-14 12:00:00.000 ]
[ 9@0, 2014-08-14 12:00:00.000 ]
-# clk 3 sizes 80 240 300% 0.33x none 1
10 10
+[ 10@0, 2014-08-14 12:00:00.000 ]
+[ 11@0, 2014-08-14 12:00:00.000 ]
+[ 12@0, 2014-08-14 12:01:00.000 ]
+[ 13@0, 2014-08-14 12:02: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 ]
+[ 2@0, 2014-08-14 12:00:00.000 ]
+[ 3@0, 2014-08-14 12:00: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 ]
+[ 5@0, 2014-08-14 12:01:00.000 ]
+[ 6@0, 2014-08-14 12:02:00.000 ]
+[ 7@0, 2014-08-14 12:00:00.000 ]
+[ 8@0, 2014-08-14 12:00:00.000 ]
[ 9@0, 2014-08-14 12:00:00.000 ]
+[ 10@0, 2014-08-14 12:00:00.000 ]
+[ 11@0, 2014-08-14 12:00:00.000 ]
+[ 12@0, 2014-08-14 12:01:00.000 ]
+[ 13@0, 2014-08-14 12:02:00.000 ]
#--------------------------#
# h t # name
# void date # type
diff --git a/monetdb5/modules/mal/Tests/mosaic_linear.mal
b/monetdb5/modules/mal/Tests/mosaic_linear.mal
--- a/monetdb5/modules/mal/Tests/mosaic_linear.mal
+++ b/monetdb5/modules/mal/Tests/mosaic_linear.mal
@@ -20,3 +20,33 @@ x:= mosaic.compress(b,"linear");
#mosaic.dump(x);
z:= mosaic.decompress(x);
io.print(z);
+
+bs:= bat.new(:oid,: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);
+xs:= mosaic.compress(bs,"linear");
+#mosaic.dump(x);
+zs:= mosaic.decompress(xs);
+io.print(zs);
+
+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,"linear");
+#mosaic.dump(xd);
+zd:= mosaic.decompress(xd);
+io.print(zd);
diff --git a/monetdb5/modules/mal/Tests/mosaic_linear.stable.out
b/monetdb5/modules/mal/Tests/mosaic_linear.stable.out
--- a/monetdb5/modules/mal/Tests/mosaic_linear.stable.out
+++ b/monetdb5/modules/mal/Tests/mosaic_linear.stable.out
@@ -37,6 +37,32 @@ function user.main():void;
#mosaic.dump(x);
z := mosaic.decompress(x);
io.print(z);
+ bs := bat.new(:oid,:timestamp);
+ bat.append(bs,"2014-08-14 12:00:00.000":timestamp);
+ bat.append(bs,"2014-08-14 12:00:00.000":timestamp);
+ bat.append(bs,"2014-08-14 12:00:00.000":timestamp);
+ bat.append(bs,"2014-08-14 12:00:00.000":timestamp);
+ bat.append(bs,"2014-08-14 12:00:00.000":timestamp);
+ bat.append(bs,"2014-08-14 12:01:00.000":timestamp);
+ bat.append(bs,"2014-08-14 12:02:00.000":timestamp);
+ bs := bat.append(bs,bs);
+ io.print(bs);
+ xs := mosaic.compress(bs,"linear");
+#mosaic.dump(x);
+ zs := mosaic.decompress(xs);
+ io.print(zs);
+ 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,"linear");
+#mosaic.dump(xd);
+ zd := mosaic.decompress(xd);
+ io.print(zd);
end main;
#--------------------------#
# h t # name
@@ -84,6 +110,70 @@ end main;
[ 9@0, 10 ]
[ 10@0, 13 ]
[ 11@0, 16 ]
+#--------------------------#
+# 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:00:00.000 ]
+[ 3@0, 2014-08-14 12:00:00.000 ]
+[ 4@0, 2014-08-14 12:00:00.000 ]
+[ 5@0, 2014-08-14 12:01:00.000 ]
+[ 6@0, 2014-08-14 12:02:00.000 ]
+[ 7@0, 2014-08-14 12:00:00.000 ]
+[ 8@0, 2014-08-14 12:00:00.000 ]
+[ 9@0, 2014-08-14 12:00:00.000 ]
+[ 10@0, 2014-08-14 12:00:00.000 ]
+[ 11@0, 2014-08-14 12:00:00.000 ]
+[ 12@0, 2014-08-14 12:01:00.000 ]
+[ 13@0, 2014-08-14 12:02: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:00:00.000 ]
+[ 3@0, 2014-08-14 12:00:00.000 ]
+[ 4@0, 2014-08-14 12:00:00.000 ]
+[ 5@0, 2014-08-14 12:01:00.000 ]
+[ 6@0, 2014-08-14 12:02:00.000 ]
+[ 7@0, 2014-08-14 12:00:00.000 ]
+[ 8@0, 2014-08-14 12:00:00.000 ]
+[ 9@0, 2014-08-14 12:00:00.000 ]
+[ 10@0, 2014-08-14 12:00:00.000 ]
+[ 11@0, 2014-08-14 12:00:00.000 ]
+[ 12@0, 2014-08-14 12:01:00.000 ]
+[ 13@0, 2014-08-14 12:02: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 ]
# 15:12:48 >
# 15:12:48 > "Done."
diff --git a/monetdb5/modules/mal/Tests/mosaic_runlength.mal
b/monetdb5/modules/mal/Tests/mosaic_runlength.mal
--- a/monetdb5/modules/mal/Tests/mosaic_runlength.mal
+++ b/monetdb5/modules/mal/Tests/mosaic_runlength.mal
@@ -161,3 +161,33 @@ io.print(f);
xf:= mosaic.compress(f,"runlength");
zf:= mosaic.decompress(xf);
io.print(zf);
+
+bs:= bat.new(:oid,: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);
+xs:= mosaic.compress(bs,"runlength");
+#mosaic.dump(x);
+zs:= mosaic.decompress(xs);
+io.print(zs);
+
+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,"runlength");
+#mosaic.dump(xd);
+zd:= mosaic.decompress(xd);
+io.print(zd);
diff --git a/monetdb5/modules/mal/Tests/mosaic_runlength.stable.out
b/monetdb5/modules/mal/Tests/mosaic_runlength.stable.out
--- a/monetdb5/modules/mal/Tests/mosaic_runlength.stable.out
+++ b/monetdb5/modules/mal/Tests/mosaic_runlength.stable.out
@@ -173,6 +173,32 @@ function user.main():void;
xf := mosaic.compress(f,"runlength");
zf := mosaic.decompress(xf);
io.print(zf);
+ bs := bat.new(:oid,:timestamp);
+ bat.append(bs,"2014-08-14 12:00:00.000":timestamp);
+ bat.append(bs,"2014-08-14 12:00:00.000":timestamp);
+ bat.append(bs,"2014-08-14 12:00:00.000":timestamp);
+ bat.append(bs,"2014-08-14 12:00:00.000":timestamp);
+ bat.append(bs,"2014-08-14 12:00:00.000":timestamp);
+ bat.append(bs,"2014-08-14 12:01:00.000":timestamp);
+ bat.append(bs,"2014-08-14 12:02:00.000":timestamp);
+ bs := bat.append(bs,bs);
+ io.print(bs);
+ xs := mosaic.compress(bs,"runlength");
+#mosaic.dump(x);
+ zs := mosaic.decompress(xs);
+ io.print(zs);
+ 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,"runlength");
+#mosaic.dump(xd);
+ zd := mosaic.decompress(xd);
+ io.print(zd);
end main;
#--------------------------#
# h t # name
@@ -677,6 +703,70 @@ end main;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
