Changeset: 3ac3191863b3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3ac3191863b3
Added Files:
monetdb5/modules/mal/Tests/mosaic_dictionary.mal
monetdb5/modules/mal/Tests/mosaic_dictionary.stable.err
monetdb5/modules/mal/Tests/mosaic_dictionary.stable.out
monetdb5/modules/mal/Tests/mosaic_dictionary_joins.mal
monetdb5/modules/mal/Tests/mosaic_dictionary_joins.stable.err
monetdb5/modules/mal/Tests/mosaic_dictionary_joins.stable.out
monetdb5/modules/mal/Tests/mosaic_dictionary_subselect.mal
monetdb5/modules/mal/Tests/mosaic_dictionary_subselect.stable.err
monetdb5/modules/mal/Tests/mosaic_dictionary_subselect.stable.out
monetdb5/modules/mal/Tests/mosaic_dictionary_thetasubselect.mal
monetdb5/modules/mal/Tests/mosaic_dictionary_thetasubselect.stable.err
monetdb5/modules/mal/Tests/mosaic_dictionary_thetasubselect.stable.out
monetdb5/modules/mal/Tests/mosaic_literal.mal
monetdb5/modules/mal/Tests/mosaic_literal.stable.err
monetdb5/modules/mal/Tests/mosaic_literal.stable.out
monetdb5/modules/mal/Tests/mosaic_literal_double.mal
monetdb5/modules/mal/Tests/mosaic_literal_double.stable.err
monetdb5/modules/mal/Tests/mosaic_literal_double.stable.out
monetdb5/modules/mal/Tests/mosaic_literal_joins.mal
monetdb5/modules/mal/Tests/mosaic_literal_joins.stable.err
monetdb5/modules/mal/Tests/mosaic_literal_joins.stable.out
monetdb5/modules/mal/Tests/mosaic_literal_subselect.mal
monetdb5/modules/mal/Tests/mosaic_literal_subselect.stable.err
monetdb5/modules/mal/Tests/mosaic_literal_subselect.stable.out
monetdb5/modules/mal/Tests/mosaic_literal_thetasubselect.mal
monetdb5/modules/mal/Tests/mosaic_literal_thetasubselect.stable.err
monetdb5/modules/mal/Tests/mosaic_literal_thetasubselect.stable.out
monetdb5/modules/mal/Tests/mosaic_runlength.mal
monetdb5/modules/mal/Tests/mosaic_runlength.stable.err
monetdb5/modules/mal/Tests/mosaic_runlength.stable.out
monetdb5/modules/mal/Tests/mosaic_runlength_joins.mal
monetdb5/modules/mal/Tests/mosaic_runlength_joins.stable.err
monetdb5/modules/mal/Tests/mosaic_runlength_joins.stable.out
monetdb5/modules/mal/Tests/mosaic_runlength_subselect.mal
monetdb5/modules/mal/Tests/mosaic_runlength_subselect.stable.err
monetdb5/modules/mal/Tests/mosaic_runlength_subselect.stable.out
monetdb5/modules/mal/Tests/mosaic_runlength_thetasubselect.mal
monetdb5/modules/mal/Tests/mosaic_runlength_thetasubselect.stable.err
monetdb5/modules/mal/Tests/mosaic_runlength_thetasubselect.stable.out
monetdb5/modules/mal/mosaic_dictionary.c
monetdb5/modules/mal/mosaic_dictionary.h
monetdb5/modules/mal/mosaic_literal.c
monetdb5/modules/mal/mosaic_literal.h
monetdb5/modules/mal/mosaic_runlength.c
monetdb5/modules/mal/mosaic_runlength.h
monetdb5/modules/mal/mosaic_variance.c
monetdb5/modules/mal/mosaic_variance.h
Removed Files:
monetdb5/modules/mal/Tests/mosaic_dict.mal
monetdb5/modules/mal/Tests/mosaic_dict.stable.err
monetdb5/modules/mal/Tests/mosaic_dict.stable.out
monetdb5/modules/mal/Tests/mosaic_dict_joins.mal
monetdb5/modules/mal/Tests/mosaic_dict_joins.stable.err
monetdb5/modules/mal/Tests/mosaic_dict_joins.stable.out
monetdb5/modules/mal/Tests/mosaic_dict_subselect.mal
monetdb5/modules/mal/Tests/mosaic_dict_subselect.stable.err
monetdb5/modules/mal/Tests/mosaic_dict_subselect.stable.out
monetdb5/modules/mal/Tests/mosaic_dict_thetasubselect.mal
monetdb5/modules/mal/Tests/mosaic_dict_thetasubselect.stable.err
monetdb5/modules/mal/Tests/mosaic_dict_thetasubselect.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_none_double.mal
monetdb5/modules/mal/Tests/mosaic_none_double.stable.err
monetdb5/modules/mal/Tests/mosaic_none_double.stable.out
monetdb5/modules/mal/Tests/mosaic_none_joins.mal
monetdb5/modules/mal/Tests/mosaic_none_joins.stable.err
monetdb5/modules/mal/Tests/mosaic_none_joins.stable.out
monetdb5/modules/mal/Tests/mosaic_none_subselect.mal
monetdb5/modules/mal/Tests/mosaic_none_subselect.stable.err
monetdb5/modules/mal/Tests/mosaic_none_subselect.stable.out
monetdb5/modules/mal/Tests/mosaic_none_thetasubselect.mal
monetdb5/modules/mal/Tests/mosaic_none_thetasubselect.stable.err
monetdb5/modules/mal/Tests/mosaic_none_thetasubselect.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
monetdb5/modules/mal/Tests/mosaic_rle_joins.mal
monetdb5/modules/mal/Tests/mosaic_rle_joins.stable.err
monetdb5/modules/mal/Tests/mosaic_rle_joins.stable.out
monetdb5/modules/mal/Tests/mosaic_rle_subselect.mal
monetdb5/modules/mal/Tests/mosaic_rle_subselect.stable.err
monetdb5/modules/mal/Tests/mosaic_rle_subselect.stable.out
monetdb5/modules/mal/Tests/mosaic_rle_thetasubselect.mal
monetdb5/modules/mal/Tests/mosaic_rle_thetasubselect.stable.err
monetdb5/modules/mal/Tests/mosaic_rle_thetasubselect.stable.out
monetdb5/modules/mal/mosaic_dict.c
monetdb5/modules/mal/mosaic_dict.h
monetdb5/modules/mal/mosaic_none.c
monetdb5/modules/mal/mosaic_none.h
monetdb5/modules/mal/mosaic_rle.c
monetdb5/modules/mal/mosaic_rle.h
Modified Files:
monetdb5/modules/mal/Makefile.ag
monetdb5/modules/mal/Tests/All
monetdb5/modules/mal/Tests/mosaic_delta.mal
monetdb5/modules/mal/Tests/mosaic_delta.stable.out
monetdb5/modules/mal/mosaic.c
monetdb5/modules/mal/mosaic.h
monetdb5/modules/mal/mosaic_delta.c
sql/test/mosaic/Tests/compression.sql
sql/test/mosaic/Tests/compressionRLE.sql
sql/test/mosaic/Tests/xqueries.sql
sql/test/mosaic/Tests/xqueries_rle.sql
Branch: mosaic
Log Message:
Big rename activity
diffs (truncated from 3265 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
@@ -64,12 +64,13 @@ lib_mal = {
json_util.c json_util.h \
mosaic.c mosaic.h \
mosaic_hdr.c mosaic_hdr.h \
- mosaic_none.c mosaic_none.h \
- mosaic_rle.c mosaic_rle.h \
- mosaic_dict.c mosaic_dict.h \
+ 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 \
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
@@ -67,35 +67,35 @@ zorder
manifold
manifoldstr
-mosaic_none
-mosaic_rle
+mosaic_literal
+mosaic_runlength
mosaic_mix
-mosaic_dict
+mosaic_dictionary
mosaic_zone
mosaic_delta
mosaic_linear
-mosaic_none_double
+mosaic_literal_double
-mosaic_none_subselect
-mosaic_rle_subselect
-mosaic_dict_subselect
+mosaic_literal_subselect
+mosaic_runlength_subselect
+mosaic_dictionary_subselect
mosaic_zone_subselect
mosaic_delta_subselect
mosaic_linear_subselect
mosaic_mix_subselect
-mosaic_none_thetasubselect
-mosaic_rle_thetasubselect
-mosaic_dict_thetasubselect
+mosaic_literal_thetasubselect
+mosaic_runlength_thetasubselect
+mosaic_dictionary_thetasubselect
mosaic_zone_thetasubselect
mosaic_delta_thetasubselect
mosaic_linear_thetasubselect
mosaic_mix_thetasubselect
-mosaic_none_joins
-mosaic_rle_joins
-mosaic_dict_joins
+mosaic_literal_joins
+mosaic_runlength_joins
+mosaic_dictionary_joins
mosaic_zone_joins
mosaic_delta_joins
mosaic_linear_joins
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
@@ -16,3 +16,31 @@ x:= mosaic.compress(b,"delta");
#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: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);
+xs:= mosaic.compress(bs,"delta");
+#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,"delta");
+#mosaic.dump(xd);
+zd:= mosaic.decompress(xd);
+io.print(zd);
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
@@ -35,6 +35,30 @@ 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: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");
+#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,"delta");
+#mosaic.dump(xd);
+ zd := mosaic.decompress(xd);
+ io.print(zd);
end main;
#--------------------------#
# h t # name
@@ -76,6 +100,64 @@ end main;
[ 7@0, 1004 ]
[ 8@0, 999 ]
[ 9@0, 977 ]
+#--------------------------#
+# 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 ]
+# clk 3 sizes 80 240 300% 0.33x none 1
10 10
+#--------------------------#
+# 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 ]
+# clk 1 sizes 40 200 500% 0.20x none 1
10 10
+#--------------------------#
+# 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 ]
# 19:05:35 >
# 19:05:35 > "Done."
diff --git a/monetdb5/modules/mal/Tests/mosaic_dict.mal
b/monetdb5/modules/mal/Tests/mosaic_dictionary.mal
rename from monetdb5/modules/mal/Tests/mosaic_dict.mal
rename to monetdb5/modules/mal/Tests/mosaic_dictionary.mal
--- a/monetdb5/modules/mal/Tests/mosaic_dict.mal
+++ b/monetdb5/modules/mal/Tests/mosaic_dictionary.mal
@@ -7,7 +7,21 @@ bat.append(b,"2014-08-14 12:00:00":times
b:= bat.append(b,b);
io.print(b);
-x:= mosaic.compress(b,"dict test 100");
+x:= mosaic.compress(b,"dictionary test 100");
#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,"dictionary test 100");
+#mosaic.dump(xd);
+zd:= mosaic.decompress(xd);
+io.print(zd);
diff --git a/monetdb5/modules/mal/Tests/mosaic_dict.stable.err
b/monetdb5/modules/mal/Tests/mosaic_dictionary.stable.err
rename from monetdb5/modules/mal/Tests/mosaic_dict.stable.err
rename to monetdb5/modules/mal/Tests/mosaic_dictionary.stable.err
--- a/monetdb5/modules/mal/Tests/mosaic_dict.stable.err
+++ b/monetdb5/modules/mal/Tests/mosaic_dictionary.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'mosaic_dict` in directory 'monetdb5/modules/mal` itself:
+stderr of test 'mosaic_dictionary` in directory 'monetdb5/modules/mal` itself:
# 00:21:55 >
diff --git a/monetdb5/modules/mal/Tests/mosaic_dict.stable.out
b/monetdb5/modules/mal/Tests/mosaic_dictionary.stable.out
rename from monetdb5/modules/mal/Tests/mosaic_dict.stable.out
rename to monetdb5/modules/mal/Tests/mosaic_dictionary.stable.out
--- a/monetdb5/modules/mal/Tests/mosaic_dict.stable.out
+++ b/monetdb5/modules/mal/Tests/mosaic_dictionary.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'mosaic_dict` in directory 'monetdb5/modules/mal` itself:
+stdout of test 'mosaic_dictionary` in directory 'monetdb5/modules/mal` itself:
# 00:21:55 >
@@ -26,10 +26,22 @@ function user.main():void;
bat.append(b,"2014-08-14 12:00:00.000":timestamp);
b := bat.append(b,b);
io.print(b);
- x := mosaic.compress(b,"dict test 100");
+ x := mosaic.compress(b,"dictionary test 100");
#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,"dictionary test 100");
+#mosaic.dump(xd);
+ zd := mosaic.decompress(xd);
+ io.print(zd);
end main;
#--------------------------#
# h t # name
@@ -68,6 +80,35 @@ end main;
[ 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 ]
+# clk 3 sizes 40 200 500% 0.20x none 1
10 10
+#--------------------------#
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
