Changeset: 757dd60cdf14 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=757dd60cdf14
Modified Files:
monetdb5/modules/mal/Tests/mosaic_frame.stable.out
monetdb5/modules/mal/Tests/mosaic_mix.malC
monetdb5/modules/mal/Tests/mosaic_mix.stable.out
monetdb5/modules/mal/mosaic.c
monetdb5/modules/mal/mosaic_dictionary.c
monetdb5/modules/mal/mosaic_hdr.c
Branch: mosaic
Log Message:
Fix checksum for decompress
and extended tests
diffs (truncated from 1865 to 300 lines):
diff --git a/monetdb5/modules/mal/Tests/mosaic_frame.stable.out
b/monetdb5/modules/mal/Tests/mosaic_frame.stable.out
--- a/monetdb5/modules/mal/Tests/mosaic_frame.stable.out
+++ b/monetdb5/modules/mal/Tests/mosaic_frame.stable.out
@@ -69,7 +69,7 @@ Ready.
[ 1@0, 1996-04-12, 1996-04-12 ]
[ 2@0, 1996-01-29, 1996-01-29 ]
[ 3@0, 1996-04-21, 1996-04-21 ]
-[ 4@0, 1994-01-16, 1994-01-16 ]
+[ 4@0, 1996-03-30, 1996-03-30 ]
[ 5@0, 1996-01-30, 1996-01-30 ]
[ 6@0, 1997-01-28, 1997-01-28 ]
[ 7@0, 1994-02-02, 1994-02-02 ]
@@ -83,7 +83,7 @@ Ready.
[ 15@0, 1994-10-16, 1994-10-16 ]
[ 16@0, 1994-08-08, 1994-08-08 ]
[ 17@0, 1992-04-27, 1992-04-27 ]
-[ 18@0, 1992-04-27, 1992-04-27 ]
+[ 18@0, 1996-05-07, 1996-05-07 ]
[ 19@0, 1996-02-01, 1996-02-01 ]
[ 20@0, 1996-01-15, 1996-01-15 ]
[ 21@0, 1996-03-21, 1996-03-21 ]
@@ -92,7 +92,7 @@ Ready.
[ 24@0, 1996-02-10, 1996-02-10 ]
[ 25@0, 1995-10-23, 1995-10-23 ]
[ 26@0, 1995-08-14, 1995-08-14 ]
-[ 27@0, 1993-12-04, 1993-12-04 ]
+[ 27@0, 1995-08-07, 1995-08-07 ]
[ 28@0, 1995-08-04, 1995-08-04 ]
[ 29@0, 1995-08-28, 1995-08-28 ]
[ 30@0, 1995-07-21, 1995-07-21 ]
@@ -101,12 +101,12 @@ Ready.
[ 33@0, 1993-12-09, 1993-12-09 ]
[ 34@0, 1993-11-09, 1993-11-09 ]
[ 35@0, 1998-10-23, 1998-10-23 ]
-[ 36@0, 1994-01-12, 1994-01-12 ]
+[ 36@0, 1998-10-09, 1998-10-09 ]
[ 37@0, 1998-10-30, 1998-10-30 ]
[ 38@0, 1996-02-21, 1996-02-21 ]
[ 39@0, 1996-01-22, 1996-01-22 ]
[ 40@0, 1996-01-19, 1996-01-19 ]
-[ 41@0, 1994-01-26, 1994-01-26 ]
+[ 41@0, 1995-11-26, 1995-11-26 ]
[ 42@0, 1995-11-08, 1995-11-08 ]
[ 43@0, 1996-02-01, 1996-02-01 ]
[ 44@0, 1996-02-03, 1996-02-03 ]
@@ -115,7 +115,7 @@ Ready.
[ 47@0, 1992-07-10, 1992-07-10 ]
[ 48@0, 1996-09-29, 1996-09-29 ]
[ 49@0, 1996-11-14, 1996-11-14 ]
-[ 50@0, 1993-04-13, 1993-04-13 ]
+[ 50@0, 1996-11-04, 1996-11-04 ]
[ 51@0, 1996-09-26, 1996-09-26 ]
[ 52@0, 1996-10-02, 1996-10-02 ]
[ 53@0, 1996-10-17, 1996-10-17 ]
@@ -124,7 +124,7 @@ Ready.
[ 56@0, 1995-04-20, 1995-04-20 ]
[ 57@0, 1995-07-17, 1995-07-17 ]
[ 58@0, 1995-07-06, 1995-07-06 ]
-[ 59@0, 1992-07-02, 1992-07-02 ]
+[ 59@0, 1994-02-19, 1994-02-19 ]
[ 60@0, 1994-02-21, 1994-02-21 ]
[ 61@0, 1997-04-17, 1997-04-17 ]
[ 62@0, 1997-01-27, 1997-01-27 ]
@@ -133,12 +133,12 @@ Ready.
[ 65@0, 1997-04-19, 1997-04-19 ]
[ 66@0, 1997-01-25, 1997-01-25 ]
[ 67@0, 1998-07-04, 1998-07-04 ]
-[ 68@0, 1993-10-29, 1993-10-29 ]
+[ 68@0, 1998-06-26, 1998-06-26 ]
[ 69@0, 1998-08-13, 1998-08-13 ]
[ 70@0, 1998-06-27, 1998-06-27 ]
[ 71@0, 1998-06-19, 1998-06-19 ]
[ 72@0, 1998-08-11, 1998-08-11 ]
-[ 73@0, 1993-05-14, 1993-05-14 ]
+[ 73@0, 1998-06-24, 1998-06-24 ]
[ 74@0, 1994-08-17, 1994-08-17 ]
[ 75@0, 1994-08-24, 1994-08-24 ]
[ 76@0, 1994-07-02, 1994-07-02 ]
@@ -156,7 +156,7 @@ Ready.
[ 88@0, 1998-02-23, 1998-02-23 ]
[ 89@0, 1998-04-12, 1998-04-12 ]
[ 90@0, 1998-01-29, 1998-01-29 ]
-[ 91@0, 1992-07-02, 1992-07-02 ]
+[ 91@0, 1998-03-05, 1998-03-05 ]
[ 92@0, 1994-07-19, 1994-07-19 ]
[ 93@0, 1994-06-03, 1994-06-03 ]
[ 94@0, 1993-04-01, 1993-04-01 ]
diff --git a/monetdb5/modules/mal/Tests/mosaic_mix.malC
b/monetdb5/modules/mal/Tests/mosaic_mix.malC
--- a/monetdb5/modules/mal/Tests/mosaic_mix.malC
+++ b/monetdb5/modules/mal/Tests/mosaic_mix.malC
@@ -96,7 +96,44 @@ bat.append(b,9);
b:= bat.append(b,b);
io.print(b);
-x:= mosaic.compress(b);
+io.print("literal");
+x:= mosaic.compress(b,"literal");
#mosaic.dump(x);
z:= mosaic.decompress(x);
io.print(z);
+
+io.print("prefix");
+x0:= mosaic.compress(b,"prefix");
+z:= mosaic.decompress(x0);
+io.print(z);
+
+io.print("dictionary");
+x1:= mosaic.compress(b,"dictionary");
+z:= mosaic.decompress(x1);
+io.print(z);
+
+io.print("runlength");
+x2:= mosaic.compress(b,"runlength");
+z:= mosaic.decompress(x2);
+io.print(z);
+
+io.print("frame");
+x3:= mosaic.compress(b,"frame");
+z:= mosaic.decompress(x3);
+io.print(z);
+
+io.print("linear");
+x4:= mosaic.compress(b,"linear");
+z:= mosaic.decompress(x4);
+io.print(z);
+
+io.print("delta");
+x5:= mosaic.compress(b,"delta");
+z:= mosaic.decompress(x5);
+io.print(z);
+
+## all together
+xall:= mosaic.compress(b);
+z:= mosaic.decompress(xall);
+io.print(xall);
+io.print(z);
diff --git a/monetdb5/modules/mal/Tests/mosaic_mix.stable.out
b/monetdb5/modules/mal/Tests/mosaic_mix.stable.out
--- a/monetdb5/modules/mal/Tests/mosaic_mix.stable.out
+++ b/monetdb5/modules/mal/Tests/mosaic_mix.stable.out
@@ -210,186 +210,1486 @@ Ready.
[ 177@0, 9 ]
[ 178@0, 9 ]
[ 179@0, 9 ]
-#none 1
-#none 2
-#none 3
-#none 4
-#none 5
-#none 6
-#none 7
-#none 8
-#none 9
-#none 10
-#none 11
-#none 12
-#none 13
-#none 14
-#none 15
-#none 16
-#none 17
-#none 18
-#none 19
-#none 20
-#none 21
-#none 22
-#none 23
-#none 24
-#none 25
-#none 26
-#none 27
-#none 28
-#none 29
-#none 30
-#none 31
-#none 32
-#none 33
-#none 34
-#none 35
-#none 36
-#none 37
-#none 38
-#none 39
-#none 40
-#none 41
-#none 42
-#none 43
-#none 44
-#none 45
-#none 46
-#none 47
-#none 48
-#none 49
-#none 50
-#none 51
-#none 52
-#none 53
-#none 54
-#none 55
-#none 56
-#none 57
-#none 58
-#none 59
-#none 60
-#none 61
-#none 62
-#none 63
-#none 64
-#none 65
-#none 66
-#none 67
-#none 68
-#none 69
-#none 70
-#none 71
-#none 72
-#none 73
-#none 74
-#none 75
-#none 76
-#none 77
-#none 78
-#none 79
-#none 80
-#none 81
-#none 82
-#none 83
-#none 84
-#none 85
-#none 86
-#none 87
-#none 88
-#none 89
-#none 90
-#none 91
-#none 92
-#none 93
-#none 94
-#none 95
-#none 96
-#none 97
-#none 98
-#none 99
-#none 100
-#none 101
-#none 102
-#none 103
-#none 104
-#none 105
-#none 106
-#none 107
-#none 108
-#none 109
-#none 110
-#none 111
-#none 112
-#none 113
-#none 114
-#none 115
-#none 116
-#none 117
-#none 118
-#none 119
-#none 120
-#none 121
-#none 122
-#none 123
-#none 124
-#none 125
-#none 126
-#none 127
-#none 128
-#none 129
-#none 130
-#none 131
-#none 132
-#none 133
-#none 134
-#none 135
-#none 136
-#none 137
-#none 138
-#none 139
-#none 140
-#none 141
-#none 142
-#none 143
-#none 144
-#none 145
-#none 146
-#none 147
-#none 148
-#none 149
-#none 150
-#none 151
-#none 152
-#none 153
-#none 154
-#none 155
-#none 156
-#none 157
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
