Changeset: 94c308c8571b for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=94c308c8571b Added Files: monetdb5/modules/mosaic/Tests/mosaic_delta_date.malC monetdb5/modules/mosaic/Tests/mosaic_delta_date.stable.err monetdb5/modules/mosaic/Tests/mosaic_delta_date.stable.out monetdb5/modules/mosaic/Tests/mosaic_delta_lng.malC monetdb5/modules/mosaic/Tests/mosaic_delta_lng.stable.err monetdb5/modules/mosaic/Tests/mosaic_delta_lng.stable.out monetdb5/modules/mosaic/Tests/mosaic_delta_oid.malC monetdb5/modules/mosaic/Tests/mosaic_delta_oid.stable.err monetdb5/modules/mosaic/Tests/mosaic_delta_oid.stable.out monetdb5/modules/mosaic/Tests/mosaic_delta_timestamp.malC monetdb5/modules/mosaic/Tests/mosaic_delta_timestamp.stable.err monetdb5/modules/mosaic/Tests/mosaic_delta_timestamp.stable.out Removed Files: monetdb5/modules/mosaic/Tests/mosaic_delta_lng_tmp.malC monetdb5/modules/mosaic/Tests/mosaic_delta_lng_tmp.stable.err monetdb5/modules/mosaic/Tests/mosaic_delta_lng_tmp.stable.out Modified Files: monetdb5/modules/mosaic/Tests/All Branch: mosaic Log Message:
Add some new style tests for delta compression. diffs (154 lines): diff --git a/monetdb5/modules/mosaic/Tests/All b/monetdb5/modules/mosaic/Tests/All --- a/monetdb5/modules/mosaic/Tests/All +++ b/monetdb5/modules/mosaic/Tests/All @@ -35,5 +35,9 @@ mosaic_frame_oid mosaic_frame_date mosaic_frame_timestamp -mosaic_delta_lng_tmp +mosaic_delta_oid +mosaic_delta_lng +mosaic_delta_date +mosaic_delta_timestamp + mosaic_linear_lng_tmp diff --git a/monetdb5/modules/mosaic/Tests/mosaic_frame_date.malC b/monetdb5/modules/mosaic/Tests/mosaic_delta_date.malC copy from monetdb5/modules/mosaic/Tests/mosaic_frame_date.malC copy to monetdb5/modules/mosaic/Tests/mosaic_delta_date.malC --- a/monetdb5/modules/mosaic/Tests/mosaic_frame_date.malC +++ b/monetdb5/modules/mosaic/Tests/mosaic_delta_date.malC @@ -29,7 +29,7 @@ bat.append(a,"2014-09-20":date); bat.append(a,"2014-09-25":date); bat.append(a,"2014-10-05":date); bat.append(a,"2014-10-02":date); -mosaic.compress(a,"frame"); +mosaic.compress(a,"delta"); c:= mosaic.decompress(a); eq := batcalc.==(a, c); io.print(a, c, eq); diff --git a/monetdb5/modules/mosaic/Tests/mosaic_frame_date.stable.err b/monetdb5/modules/mosaic/Tests/mosaic_delta_date.stable.err copy from monetdb5/modules/mosaic/Tests/mosaic_frame_date.stable.err copy to monetdb5/modules/mosaic/Tests/mosaic_delta_date.stable.err --- a/monetdb5/modules/mosaic/Tests/mosaic_frame_date.stable.err +++ b/monetdb5/modules/mosaic/Tests/mosaic_delta_date.stable.err @@ -1,4 +1,4 @@ -stderr of test 'mosaic_frame_date` in directory 'monetdb5/modules/mosaic` itself: +stderr of test 'mosaic_delta_date` in directory 'monetdb5/modules/mosaic` itself: # 17:20:28 > diff --git a/monetdb5/modules/mosaic/Tests/mosaic_frame_date.stable.out b/monetdb5/modules/mosaic/Tests/mosaic_delta_date.stable.out copy from monetdb5/modules/mosaic/Tests/mosaic_frame_date.stable.out copy to monetdb5/modules/mosaic/Tests/mosaic_delta_date.stable.out --- a/monetdb5/modules/mosaic/Tests/mosaic_frame_date.stable.out +++ b/monetdb5/modules/mosaic/Tests/mosaic_delta_date.stable.out @@ -1,4 +1,4 @@ -stdout of test 'mosaic_frame_date` in directory 'monetdb5/modules/mosaic` itself: +stdout of test 'mosaic_delta_date` in directory 'monetdb5/modules/mosaic` itself: # 17:20:28 > diff --git a/monetdb5/modules/mosaic/Tests/mosaic_delta_lng_tmp.malC b/monetdb5/modules/mosaic/Tests/mosaic_delta_lng.malC rename from monetdb5/modules/mosaic/Tests/mosaic_delta_lng_tmp.malC rename to monetdb5/modules/mosaic/Tests/mosaic_delta_lng.malC diff --git a/monetdb5/modules/mosaic/Tests/mosaic_delta_lng_tmp.stable.err b/monetdb5/modules/mosaic/Tests/mosaic_delta_lng.stable.err rename from monetdb5/modules/mosaic/Tests/mosaic_delta_lng_tmp.stable.err rename to monetdb5/modules/mosaic/Tests/mosaic_delta_lng.stable.err --- a/monetdb5/modules/mosaic/Tests/mosaic_delta_lng_tmp.stable.err +++ b/monetdb5/modules/mosaic/Tests/mosaic_delta_lng.stable.err @@ -1,4 +1,4 @@ -stderr of test 'mosaic_delta_lng_tmp` in directory 'monetdb5/modules/mosaic` itself: +stderr of test 'mosaic_delta_lng` in directory 'monetdb5/modules/mosaic` itself: # 13:19:01 > diff --git a/monetdb5/modules/mosaic/Tests/mosaic_delta_lng_tmp.stable.out b/monetdb5/modules/mosaic/Tests/mosaic_delta_lng.stable.out rename from monetdb5/modules/mosaic/Tests/mosaic_delta_lng_tmp.stable.out rename to monetdb5/modules/mosaic/Tests/mosaic_delta_lng.stable.out --- a/monetdb5/modules/mosaic/Tests/mosaic_delta_lng_tmp.stable.out +++ b/monetdb5/modules/mosaic/Tests/mosaic_delta_lng.stable.out @@ -1,4 +1,4 @@ -stdout of test 'mosaic_delta_lng_tmp` in directory 'monetdb5/modules/mosaic` itself: +stdout of test 'mosaic_delta_lng` in directory 'monetdb5/modules/mosaic` itself: # 13:19:01 > diff --git a/monetdb5/modules/mosaic/Tests/mosaic_frame_oid.malC b/monetdb5/modules/mosaic/Tests/mosaic_delta_oid.malC copy from monetdb5/modules/mosaic/Tests/mosaic_frame_oid.malC copy to monetdb5/modules/mosaic/Tests/mosaic_delta_oid.malC --- a/monetdb5/modules/mosaic/Tests/mosaic_frame_oid.malC +++ b/monetdb5/modules/mosaic/Tests/mosaic_delta_oid.malC @@ -29,7 +29,7 @@ bat.append(a,990:oid); bat.append(a,995:oid); bat.append(a,1005:oid); bat.append(a,1002:oid); -mosaic.compress(a,"frame"); +mosaic.compress(a,"delta"); c:= mosaic.decompress(a); io.print(a, c); diff --git a/monetdb5/modules/mosaic/Tests/mosaic_frame_oid.stable.err b/monetdb5/modules/mosaic/Tests/mosaic_delta_oid.stable.err copy from monetdb5/modules/mosaic/Tests/mosaic_frame_oid.stable.err copy to monetdb5/modules/mosaic/Tests/mosaic_delta_oid.stable.err --- a/monetdb5/modules/mosaic/Tests/mosaic_frame_oid.stable.err +++ b/monetdb5/modules/mosaic/Tests/mosaic_delta_oid.stable.err @@ -1,4 +1,4 @@ -stderr of test 'mosaic_frame_oid` in directory 'monetdb5/modules/mosaic` itself: +stderr of test 'mosaic_delta_oid` in directory 'monetdb5/modules/mosaic` itself: # 13:19:01 > diff --git a/monetdb5/modules/mosaic/Tests/mosaic_frame_oid.stable.out b/monetdb5/modules/mosaic/Tests/mosaic_delta_oid.stable.out copy from monetdb5/modules/mosaic/Tests/mosaic_frame_oid.stable.out copy to monetdb5/modules/mosaic/Tests/mosaic_delta_oid.stable.out --- a/monetdb5/modules/mosaic/Tests/mosaic_frame_oid.stable.out +++ b/monetdb5/modules/mosaic/Tests/mosaic_delta_oid.stable.out @@ -1,4 +1,4 @@ -stdout of test 'mosaic_frame_oid` in directory 'monetdb5/modules/mosaic` itself: +stdout of test 'mosaic_delta_oid` in directory 'monetdb5/modules/mosaic` itself: # 13:19:01 > diff --git a/monetdb5/modules/mosaic/Tests/mosaic_frame_timestamp.malC b/monetdb5/modules/mosaic/Tests/mosaic_delta_timestamp.malC copy from monetdb5/modules/mosaic/Tests/mosaic_frame_timestamp.malC copy to monetdb5/modules/mosaic/Tests/mosaic_delta_timestamp.malC --- a/monetdb5/modules/mosaic/Tests/mosaic_frame_timestamp.malC +++ b/monetdb5/modules/mosaic/Tests/mosaic_delta_timestamp.malC @@ -1,3 +1,6 @@ +TODO := "Does not use delta compression! Fix hardcoded type of delta!":str; +io.print(TODO); + a:= bat.new(:timestamp); bat.append(a,"2014-08-14 12:10:00":timestamp); bat.append(a,"2014-08-14 12:10:01":timestamp); @@ -29,7 +32,7 @@ bat.append(a,"2014-08-14 12:09:50":times bat.append(a,"2014-08-14 12:09:55":timestamp); bat.append(a,"2014-08-14 12:10:05":timestamp); bat.append(a,"2014-08-14 12:10:02":timestamp); -mosaic.compress(a,"frame"); +mosaic.compress(a,"delta"); c:= mosaic.decompress(a); eq := batcalc.==(a, c); io.print(a, c, eq); diff --git a/monetdb5/modules/mosaic/Tests/mosaic_frame_timestamp.stable.err b/monetdb5/modules/mosaic/Tests/mosaic_delta_timestamp.stable.err copy from monetdb5/modules/mosaic/Tests/mosaic_frame_timestamp.stable.err copy to monetdb5/modules/mosaic/Tests/mosaic_delta_timestamp.stable.err --- a/monetdb5/modules/mosaic/Tests/mosaic_frame_timestamp.stable.err +++ b/monetdb5/modules/mosaic/Tests/mosaic_delta_timestamp.stable.err @@ -1,4 +1,4 @@ -stderr of test 'mosaic_frame_timestamp` in directory 'monetdb5/modules/mosaic` itself: +stderr of test 'mosaic_delta_timestamp` in directory 'monetdb5/modules/mosaic` itself: # 17:20:28 > diff --git a/monetdb5/modules/mosaic/Tests/mosaic_frame_timestamp.stable.out b/monetdb5/modules/mosaic/Tests/mosaic_delta_timestamp.stable.out copy from monetdb5/modules/mosaic/Tests/mosaic_frame_timestamp.stable.out copy to monetdb5/modules/mosaic/Tests/mosaic_delta_timestamp.stable.out --- a/monetdb5/modules/mosaic/Tests/mosaic_frame_timestamp.stable.out +++ b/monetdb5/modules/mosaic/Tests/mosaic_delta_timestamp.stable.out @@ -1,4 +1,4 @@ -stdout of test 'mosaic_frame_timestamp` in directory 'monetdb5/modules/mosaic` itself: +stdout of test 'mosaic_delta_timestamp` in directory 'monetdb5/modules/mosaic` itself: # 17:20:28 > _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
