Changeset: 47d1a65f20b1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=47d1a65f20b1
Modified Files:
monetdb5/modules/mosaic/Tests/mosaic_calendar.malC
monetdb5/modules/mosaic/Tests/mosaic_delta.malC
monetdb5/modules/mosaic/Tests/mosaic_dictionary.malC
monetdb5/modules/mosaic/Tests/mosaic_dictionary_joins.malC
monetdb5/modules/mosaic/Tests/mosaic_dictionary_select.malC
monetdb5/modules/mosaic/Tests/mosaic_dictionary_thetaselect.malC
monetdb5/modules/mosaic/Tests/mosaic_frame.malC
monetdb5/modules/mosaic/Tests/mosaic_frame_joins.malC
monetdb5/modules/mosaic/Tests/mosaic_frame_select.malC
monetdb5/modules/mosaic/Tests/mosaic_frame_thetaselect.malC
monetdb5/modules/mosaic/Tests/mosaic_linear.malC
monetdb5/modules/mosaic/Tests/mosaic_linear_joins.malC
monetdb5/modules/mosaic/Tests/mosaic_linear_select.malC
monetdb5/modules/mosaic/Tests/mosaic_linear_thetaselect.malC
monetdb5/modules/mosaic/Tests/mosaic_mix.malC
monetdb5/modules/mosaic/Tests/mosaic_prefix.malC
monetdb5/modules/mosaic/Tests/mosaic_prefix_joins.malC
monetdb5/modules/mosaic/Tests/mosaic_raw.malC
monetdb5/modules/mosaic/Tests/mosaic_raw_double.malC
monetdb5/modules/mosaic/Tests/mosaic_runlength.malC
monetdb5/modules/mosaic/Tests/mosaic_zone.malC
Branch: mosaic
Log Message:
adjust mal tests to use the new MOSdecompress signature.
diffs (truncated from 362 to 300 lines):
diff --git a/monetdb5/modules/mosaic/Tests/mosaic_calendar.malC
b/monetdb5/modules/mosaic/Tests/mosaic_calendar.malC
--- a/monetdb5/modules/mosaic/Tests/mosaic_calendar.malC
+++ b/monetdb5/modules/mosaic/Tests/mosaic_calendar.malC
@@ -14,7 +14,7 @@ bat.append(d,"2015-07-11":date);
io.print(d);
mosaic.compress(d,"calendar");
#mosaic.dump(xd);
-mosaic.decompress(d);
+d:= mosaic.decompress(d);
io.print(d);
bs:= bat.new(:timestamp);
diff --git a/monetdb5/modules/mosaic/Tests/mosaic_delta.malC
b/monetdb5/modules/mosaic/Tests/mosaic_delta.malC
--- a/monetdb5/modules/mosaic/Tests/mosaic_delta.malC
+++ b/monetdb5/modules/mosaic/Tests/mosaic_delta.malC
@@ -15,7 +15,7 @@ base:= algebra.copy(b);
io.print(base);
mosaic.compress(b,"delta");
#mosaic.dump(b);
-mosaic.decompress(b);
+b:= mosaic.decompress(b);
io.print(b);
bs:= bat.new(:timestamp);
diff --git a/monetdb5/modules/mosaic/Tests/mosaic_dictionary.malC
b/monetdb5/modules/mosaic/Tests/mosaic_dictionary.malC
--- a/monetdb5/modules/mosaic/Tests/mosaic_dictionary.malC
+++ b/monetdb5/modules/mosaic/Tests/mosaic_dictionary.malC
@@ -10,7 +10,7 @@ base:= algebra.copy(b);
io.print(base);
mosaic.compress(b,"dictionary");
#mosaic.dump(b);
-mosaic.decompress(b);
+b:= mosaic.decompress(b);
io.print(b);
d:= bat.new(:date);
@@ -24,5 +24,5 @@ d:= bat.append(d,d);
io.print(d);
mosaic.compress(d,"dictionary");
mosaic.dump(d);
-mosaic.decompress(d);
+d:= mosaic.decompress(d);
io.print(d);
diff --git a/monetdb5/modules/mosaic/Tests/mosaic_dictionary_joins.malC
b/monetdb5/modules/mosaic/Tests/mosaic_dictionary_joins.malC
--- a/monetdb5/modules/mosaic/Tests/mosaic_dictionary_joins.malC
+++ b/monetdb5/modules/mosaic/Tests/mosaic_dictionary_joins.malC
@@ -10,10 +10,10 @@ base:= algebra.copy(b);
io.print(base);
mosaic.compress(b,"dictionary test 100");
#mosaic.dump(b);
-mosaic.decompress(b);
+b:= mosaic.decompress(b);
io.print(b);
-mosaic.decompress(b);
+b:= mosaic.decompress(b);
c:= bat.new(:oid);
bat.append(c,0@0);
bat.append(c,2@0);
diff --git a/monetdb5/modules/mosaic/Tests/mosaic_dictionary_select.malC
b/monetdb5/modules/mosaic/Tests/mosaic_dictionary_select.malC
--- a/monetdb5/modules/mosaic/Tests/mosaic_dictionary_select.malC
+++ b/monetdb5/modules/mosaic/Tests/mosaic_dictionary_select.malC
@@ -10,7 +10,7 @@ base:= algebra.copy(b);
io.print(base);
mosaic.compress(b,"dictionary test 100");
#mosaic.dump(b);
-mosaic.decompress(b);
+b:= mosaic.decompress(b);
io.print(b);
s:= algebra.select(base,"2014-08-14 12:00:00":timestamp,"2014-08-14
12:02:00":timestamp,false,false,false);
diff --git a/monetdb5/modules/mosaic/Tests/mosaic_dictionary_thetaselect.malC
b/monetdb5/modules/mosaic/Tests/mosaic_dictionary_thetaselect.malC
--- a/monetdb5/modules/mosaic/Tests/mosaic_dictionary_thetaselect.malC
+++ b/monetdb5/modules/mosaic/Tests/mosaic_dictionary_thetaselect.malC
@@ -11,7 +11,7 @@ base:= algebra.copy(b);
io.print(base);
mosaic.compress(b,"dictionary test 10");
#mosaic.dump(b);
-mosaic.decompress(b);
+b:= mosaic.decompress(b);
io.print(b);
s:= algebra.thetaselect(base,"2014-08-14 12:01:00":timestamp,"<");
diff --git a/monetdb5/modules/mosaic/Tests/mosaic_frame.malC
b/monetdb5/modules/mosaic/Tests/mosaic_frame.malC
--- a/monetdb5/modules/mosaic/Tests/mosaic_frame.malC
+++ b/monetdb5/modules/mosaic/Tests/mosaic_frame.malC
@@ -9,7 +9,7 @@ base:= algebra.copy(b);
mosaic.compress(b,"frame");
#mosaic.dump(b);
-mosaic.decompress(b);
+b:= mosaic.decompress(b);
io.print(base,b);
d:= bat.new(:date);
@@ -23,7 +23,7 @@ dbase:= algebra.copy(d);
mosaic.compress(d,"frame");
#mosaic.dump(d);
-mosaic.decompress(d);
+d:= mosaic.decompress(d);
io.print(dbase,d);
e:= bat.new(:date);
@@ -131,6 +131,6 @@ bat.append(e,"1994-12-30":date);
ebase:= algebra.copy(e);
mosaic.compress(e,"frame");
mosaic.dump(e);
-mosaic.decompress(e);
+e:= mosaic.decompress(e);
io.print(ebase,e);
#mosaic.analyse("frame prefix");
diff --git a/monetdb5/modules/mosaic/Tests/mosaic_frame_joins.malC
b/monetdb5/modules/mosaic/Tests/mosaic_frame_joins.malC
--- a/monetdb5/modules/mosaic/Tests/mosaic_frame_joins.malC
+++ b/monetdb5/modules/mosaic/Tests/mosaic_frame_joins.malC
@@ -9,7 +9,7 @@ base:= algebra.copy(b);
mosaic.compress(b,"frame");
#mosaic.dump(b);
-mosaic.decompress(b);
+b:= mosaic.decompress(b);
io.print(base,b);
c:= bat.new(:oid);
diff --git a/monetdb5/modules/mosaic/Tests/mosaic_frame_select.malC
b/monetdb5/modules/mosaic/Tests/mosaic_frame_select.malC
--- a/monetdb5/modules/mosaic/Tests/mosaic_frame_select.malC
+++ b/monetdb5/modules/mosaic/Tests/mosaic_frame_select.malC
@@ -10,7 +10,7 @@ base:= algebra.copy(b);
io.print(base);
mosaic.compress(b,"frame");
#mosaic.dump(b);
-mosaic.decompress(b);
+b:= mosaic.decompress(b);
io.print(b);
s:= algebra.select(base,"2014-08-14 12:00:00":timestamp,"2014-08-14
12:02:00":timestamp,false,false,false);
diff --git a/monetdb5/modules/mosaic/Tests/mosaic_frame_thetaselect.malC
b/monetdb5/modules/mosaic/Tests/mosaic_frame_thetaselect.malC
--- a/monetdb5/modules/mosaic/Tests/mosaic_frame_thetaselect.malC
+++ b/monetdb5/modules/mosaic/Tests/mosaic_frame_thetaselect.malC
@@ -11,7 +11,7 @@ base:= algebra.copy(b);
io.print(base);
mosaic.compress(b,"frame");
#mosaic.dump(b);
-mosaic.decompress(b);
+b:= mosaic.decompress(b);
io.print(b);
s:= algebra.thetaselect(base,"2014-08-14 12:01:00":timestamp,"<");
diff --git a/monetdb5/modules/mosaic/Tests/mosaic_linear.malC
b/monetdb5/modules/mosaic/Tests/mosaic_linear.malC
--- a/monetdb5/modules/mosaic/Tests/mosaic_linear.malC
+++ b/monetdb5/modules/mosaic/Tests/mosaic_linear.malC
@@ -18,7 +18,7 @@ base:= algebra.copy(b);
io.print(base);
mosaic.compress(b,"linear");
#mosaic.dump(b);
-mosaic.decompress(b);
+b:= mosaic.decompress(b);
io.print(b);
bs:= bat.new(:timestamp);
@@ -34,7 +34,7 @@ bs:= bat.append(bs,bs);
io.print(bs);
mosaic.compress(bs,"linear");
#mosaic.dump(bs);
-mosaic.decompress(bs);
+bs:= mosaic.decompress(bs);
io.print(bs);
d:= bat.new(:date);
@@ -48,5 +48,5 @@ d:= bat.append(d,d);
io.print(d);
mosaic.compress(d,"linear");
#mosaic.dump(d);
-mosaic.decompress(d);
+d:= mosaic.decompress(d);
io.print(d);
diff --git a/monetdb5/modules/mosaic/Tests/mosaic_linear_joins.malC
b/monetdb5/modules/mosaic/Tests/mosaic_linear_joins.malC
--- a/monetdb5/modules/mosaic/Tests/mosaic_linear_joins.malC
+++ b/monetdb5/modules/mosaic/Tests/mosaic_linear_joins.malC
@@ -18,7 +18,7 @@ base:= algebra.copy(b);
io.print(base);
mosaic.compress(b,"linear");
#mosaic.dump(b);
-mosaic.decompress(b);
+b:= mosaic.decompress(b);
io.print(b);
c:= bat.new(:oid);
diff --git a/monetdb5/modules/mosaic/Tests/mosaic_linear_select.malC
b/monetdb5/modules/mosaic/Tests/mosaic_linear_select.malC
--- a/monetdb5/modules/mosaic/Tests/mosaic_linear_select.malC
+++ b/monetdb5/modules/mosaic/Tests/mosaic_linear_select.malC
@@ -18,7 +18,7 @@ base:= algebra.copy(b);
io.print(base);
mosaic.compress(b,"linear");
#mosaic.dump(b);
-mosaic.decompress(b);
+b:= mosaic.decompress(b);
io.print(b);
s:= algebra.select(base,0,4,false,false,false);
diff --git a/monetdb5/modules/mosaic/Tests/mosaic_linear_thetaselect.malC
b/monetdb5/modules/mosaic/Tests/mosaic_linear_thetaselect.malC
--- a/monetdb5/modules/mosaic/Tests/mosaic_linear_thetaselect.malC
+++ b/monetdb5/modules/mosaic/Tests/mosaic_linear_thetaselect.malC
@@ -18,7 +18,7 @@ base:= algebra.copy(b);
io.print(base);
mosaic.compress(b,"linear");
#mosaic.dump(b);
-mosaic.decompress(b);
+b:= mosaic.decompress(b);
io.print(b);
c:= bat.new(:oid);
diff --git a/monetdb5/modules/mosaic/Tests/mosaic_mix.malC
b/monetdb5/modules/mosaic/Tests/mosaic_mix.malC
--- a/monetdb5/modules/mosaic/Tests/mosaic_mix.malC
+++ b/monetdb5/modules/mosaic/Tests/mosaic_mix.malC
@@ -98,5 +98,5 @@ b:= bat.append(b,b);
io.print(b);
mosaic.compress(b);
#mosaic.dump(b);
-mosaic.decompress(b);
+b:= mosaic.decompress(b);
io.print(b);
diff --git a/monetdb5/modules/mosaic/Tests/mosaic_prefix.malC
b/monetdb5/modules/mosaic/Tests/mosaic_prefix.malC
--- a/monetdb5/modules/mosaic/Tests/mosaic_prefix.malC
+++ b/monetdb5/modules/mosaic/Tests/mosaic_prefix.malC
@@ -29,7 +29,7 @@ bat.append(b,255:int);
io.print(b);
mosaic.compress(b,"prefix");
#mosaic.dump(b);
-mosaic.decompress(b);
+b:= mosaic.decompress(b);
io.print(b);
c:= bat.new(:sht);
@@ -63,5 +63,5 @@ bat.append(c,255:sht);
io.print(c);
mosaic.compress(c,"prefix");
mosaic.dump(c);
-mosaic.decompress(c);
+c:= mosaic.decompress(c);
io.print(c);
diff --git a/monetdb5/modules/mosaic/Tests/mosaic_prefix_joins.malC
b/monetdb5/modules/mosaic/Tests/mosaic_prefix_joins.malC
--- a/monetdb5/modules/mosaic/Tests/mosaic_prefix_joins.malC
+++ b/monetdb5/modules/mosaic/Tests/mosaic_prefix_joins.malC
@@ -30,7 +30,7 @@ base:=algebra.copy(b);
io.print(b);
mosaic.compress(b,"prefix");
#mosaic.dump(b);
-mosaic.decompress(b);
+b:= mosaic.decompress(b);
io.print(b);
# Linear range compressions
diff --git a/monetdb5/modules/mosaic/Tests/mosaic_raw.malC
b/monetdb5/modules/mosaic/Tests/mosaic_raw.malC
--- a/monetdb5/modules/mosaic/Tests/mosaic_raw.malC
+++ b/monetdb5/modules/mosaic/Tests/mosaic_raw.malC
@@ -8,7 +8,7 @@ base:= algebra.copy(b);
io.print(b);
mosaic.compress(b,"raw");
#mosaic.dump(b);
-mosaic.decompress(b);
+b:= mosaic.decompress(b);
io.print(b);
@@ -19,5 +19,5 @@ bat.append(s,"brown");
bat.append(s,"fox");
mosaic.compress(s,"raw");
-mosaic.decompress(s);
+s:= mosaic.decompress(s);
io.print(s);
diff --git a/monetdb5/modules/mosaic/Tests/mosaic_raw_double.malC
b/monetdb5/modules/mosaic/Tests/mosaic_raw_double.malC
--- a/monetdb5/modules/mosaic/Tests/mosaic_raw_double.malC
+++ b/monetdb5/modules/mosaic/Tests/mosaic_raw_double.malC
@@ -8,10 +8,10 @@ base:= algebra.copy(b);
io.print(base);
mosaic.compress(b,"raw");
mosaic.dump(b);
-mosaic.decompress(b);
+b:= mosaic.decompress(b);
io.print(b);
mosaic.compress(b,"raw");
mosaic.dump(b);
-mosaic.decompress(b);
+b:= mosaic.decompress(b);
io.print(b);
diff --git a/monetdb5/modules/mosaic/Tests/mosaic_runlength.malC
b/monetdb5/modules/mosaic/Tests/mosaic_runlength.malC
--- a/monetdb5/modules/mosaic/Tests/mosaic_runlength.malC
+++ b/monetdb5/modules/mosaic/Tests/mosaic_runlength.malC
@@ -61,7 +61,7 @@ base:= algebra.copy(b);
io.print(base);
mosaic.compress(b,"runlength");
#mosaic.dump(b);
-mosaic.decompress(b);
+b:= mosaic.decompress(b);
io.print(b);
# OID list compressions
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
