Changeset: dbc39f3caee9 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dbc39f3caee9 Modified Files: monetdb5/modules/mosaic/Tests/mosaic_bit_1.capped.stable.out monetdb5/modules/mosaic/Tests/mosaic_bit_1.frame.stable.out monetdb5/modules/mosaic/Tests/mosaic_bit_1.mal monetdb5/modules/mosaic/Tests/mosaic_bit_1.prefix.stable.out monetdb5/modules/mosaic/Tests/mosaic_bit_1.raw.stable.out monetdb5/modules/mosaic/Tests/mosaic_bit_1.var.stable.out monetdb5/modules/mosaic/Tests/mosaic_bit_2.linear.stable.out monetdb5/modules/mosaic/Tests/mosaic_bit_2.mal monetdb5/modules/mosaic/Tests/mosaic_bit_2.runlength.stable.out monetdb5/modules/mosaic/Tests/mosaic_bit_with_nills_1.frame.stable.out monetdb5/modules/mosaic/Tests/mosaic_bit_with_nills_1.mal monetdb5/modules/mosaic/Tests/mosaic_bit_with_nills_1.raw.stable.out monetdb5/modules/mosaic/Tests/mosaic_date_1.capped.stable.out monetdb5/modules/mosaic/Tests/mosaic_date_1.delta.stable.out monetdb5/modules/mosaic/Tests/mosaic_date_1.frame.stable.out monetdb5/modules/mosaic/Tests/mosaic_date_1.mal monetdb5/modules/mosaic/Tests/mosaic_date_1.prefix.stable.out monetdb5/modules/mosaic/Tests/mosaic_date_1.raw.stable.out monetdb5/modules/mosaic/Tests/mosaic_date_1.var.stable.out monetdb5/modules/mosaic/Tests/mosaic_date_2.linear.stable.out monetdb5/modules/mosaic/Tests/mosaic_date_2.mal monetdb5/modules/mosaic/Tests/mosaic_date_2.runlength.stable.out monetdb5/modules/mosaic/Tests/mosaic_date_with_nills_1.frame.stable.out monetdb5/modules/mosaic/Tests/mosaic_date_with_nills_1.mal monetdb5/modules/mosaic/Tests/mosaic_date_with_nills_1.raw.stable.out monetdb5/modules/mosaic/Tests/mosaic_lng_1.capped.stable.out monetdb5/modules/mosaic/Tests/mosaic_lng_1.delta.stable.out monetdb5/modules/mosaic/Tests/mosaic_lng_1.frame.stable.out monetdb5/modules/mosaic/Tests/mosaic_lng_1.mal monetdb5/modules/mosaic/Tests/mosaic_lng_1.prefix.stable.out monetdb5/modules/mosaic/Tests/mosaic_lng_1.raw.stable.out monetdb5/modules/mosaic/Tests/mosaic_lng_1.var.stable.out monetdb5/modules/mosaic/Tests/mosaic_lng_2.linear.stable.out monetdb5/modules/mosaic/Tests/mosaic_lng_2.mal monetdb5/modules/mosaic/Tests/mosaic_lng_2.runlength.stable.out monetdb5/modules/mosaic/Tests/mosaic_lng_with_nills_1.frame.stable.out monetdb5/modules/mosaic/Tests/mosaic_lng_with_nills_1.mal monetdb5/modules/mosaic/Tests/mosaic_lng_with_nills_1.raw.stable.out monetdb5/modules/mosaic/Tests/mosaic_oid_1.capped.stable.out monetdb5/modules/mosaic/Tests/mosaic_oid_1.delta.stable.out monetdb5/modules/mosaic/Tests/mosaic_oid_1.frame.stable.out monetdb5/modules/mosaic/Tests/mosaic_oid_1.mal monetdb5/modules/mosaic/Tests/mosaic_oid_1.prefix.stable.out monetdb5/modules/mosaic/Tests/mosaic_oid_1.raw.stable.out monetdb5/modules/mosaic/Tests/mosaic_oid_1.var.stable.out monetdb5/modules/mosaic/Tests/mosaic_oid_2.linear.stable.out monetdb5/modules/mosaic/Tests/mosaic_oid_2.mal monetdb5/modules/mosaic/Tests/mosaic_oid_2.runlength.stable.out monetdb5/modules/mosaic/Tests/mosaic_oid_with_nills_1.frame.stable.out monetdb5/modules/mosaic/Tests/mosaic_oid_with_nills_1.mal monetdb5/modules/mosaic/Tests/mosaic_oid_with_nills_1.raw.stable.out monetdb5/modules/mosaic/Tests/mosaic_timestamp_1.capped.stable.out monetdb5/modules/mosaic/Tests/mosaic_timestamp_1.frame.stable.out monetdb5/modules/mosaic/Tests/mosaic_timestamp_1.mal monetdb5/modules/mosaic/Tests/mosaic_timestamp_1.prefix.stable.out monetdb5/modules/mosaic/Tests/mosaic_timestamp_1.raw.stable.out monetdb5/modules/mosaic/Tests/mosaic_timestamp_1.var.stable.out monetdb5/modules/mosaic/Tests/mosaic_timestamp_2.linear.stable.out monetdb5/modules/mosaic/Tests/mosaic_timestamp_2.mal monetdb5/modules/mosaic/Tests/mosaic_timestamp_2.runlength.stable.out monetdb5/modules/mosaic/Tests/mosaic_timestamp_with_nills_1.frame.stable.out monetdb5/modules/mosaic/Tests/mosaic_timestamp_with_nills_1.mal monetdb5/modules/mosaic/Tests/mosaic_timestamp_with_nills_1.raw.stable.out monetdb5/modules/mosaic/mosaic_frame.c monetdb5/modules/mosaic/mosaic_raw.c Branch: mosaic Log Message:
Handle the select cornercase: low > hgh. diffs (truncated from 3793 to 300 lines): diff --git a/monetdb5/modules/mosaic/Tests/mosaic_bit_1.capped.stable.out b/monetdb5/modules/mosaic/Tests/mosaic_bit_1.capped.stable.out --- a/monetdb5/modules/mosaic/Tests/mosaic_bit_1.capped.stable.out +++ b/monetdb5/modules/mosaic/Tests/mosaic_bit_1.capped.stable.out @@ -50,6 +50,8 @@ MOSselect_capped MOSselect_capped MOSselect_capped MOSselect_capped +MOSselect_capped +MOSselect_capped MOSthetaselect_capped MOSselect_capped MOSthetaselect_capped @@ -539,6 +541,73 @@ MOSprojection_capped #--------------------------# #--------------------------# # t t t # name +# void void oid # type +#--------------------------# +#--------------------------# +# t t t # name +# void void oid # type +#--------------------------# +[ 0@0, 0@0, 0@0 ] +[ 1@0, 1@0, 1@0 ] +[ 2@0, 2@0, 2@0 ] +[ 3@0, 3@0, 3@0 ] +[ 4@0, 4@0, 4@0 ] +[ 5@0, 5@0, 5@0 ] +[ 6@0, 6@0, 6@0 ] +[ 7@0, 7@0, 7@0 ] +[ 8@0, 8@0, 8@0 ] +[ 9@0, 9@0, 9@0 ] +[ 10@0, 10@0, 10@0 ] +[ 11@0, 11@0, 11@0 ] +[ 12@0, 12@0, 12@0 ] +[ 13@0, 13@0, 13@0 ] +[ 14@0, 14@0, 14@0 ] +[ 15@0, 15@0, 15@0 ] +[ 16@0, 16@0, 16@0 ] +[ 17@0, 17@0, 17@0 ] +[ 18@0, 18@0, 18@0 ] +[ 19@0, 19@0, 19@0 ] +[ 20@0, 20@0, 20@0 ] +[ 21@0, 21@0, 21@0 ] +[ 22@0, 22@0, 22@0 ] +[ 23@0, 23@0, 23@0 ] +[ 24@0, 24@0, 24@0 ] +[ 25@0, 25@0, 25@0 ] +[ 26@0, 26@0, 26@0 ] +[ 27@0, 27@0, 27@0 ] +[ 28@0, 28@0, 28@0 ] +[ 29@0, 29@0, 29@0 ] +[ 30@0, 30@0, 30@0 ] +[ 31@0, 31@0, 31@0 ] +[ 32@0, 32@0, 32@0 ] +[ 33@0, 33@0, 33@0 ] +[ 34@0, 34@0, 34@0 ] +[ 35@0, 35@0, 35@0 ] +[ 36@0, 36@0, 36@0 ] +[ 37@0, 37@0, 37@0 ] +[ 38@0, 38@0, 38@0 ] +[ 39@0, 39@0, 39@0 ] +[ 40@0, 40@0, 40@0 ] +[ 41@0, 41@0, 41@0 ] +[ 42@0, 42@0, 42@0 ] +[ 43@0, 43@0, 43@0 ] +[ 44@0, 44@0, 44@0 ] +[ 45@0, 45@0, 45@0 ] +[ 46@0, 46@0, 46@0 ] +[ 47@0, 47@0, 47@0 ] +[ 48@0, 48@0, 48@0 ] +[ 49@0, 49@0, 49@0 ] +[ 50@0, 50@0, 50@0 ] +[ 51@0, 51@0, 51@0 ] +[ 52@0, 52@0, 52@0 ] +[ 53@0, 53@0, 53@0 ] +[ 54@0, 54@0, 54@0 ] +[ 55@0, 55@0, 55@0 ] +[ 56@0, 56@0, 56@0 ] +[ 57@0, 57@0, 57@0 ] +[ 58@0, 58@0, 58@0 ] +#--------------------------# +# t t t # name # void oid oid # type #--------------------------# [ 0@0, 0@0, 0@0 ] diff --git a/monetdb5/modules/mosaic/Tests/mosaic_bit_1.frame.stable.out b/monetdb5/modules/mosaic/Tests/mosaic_bit_1.frame.stable.out --- a/monetdb5/modules/mosaic/Tests/mosaic_bit_1.frame.stable.out +++ b/monetdb5/modules/mosaic/Tests/mosaic_bit_1.frame.stable.out @@ -50,6 +50,8 @@ MOSselect_frame MOSselect_frame MOSselect_frame MOSselect_frame +MOSselect_frame +MOSselect_frame MOSthetaselect_frame MOSselect_frame MOSthetaselect_frame @@ -539,6 +541,73 @@ MOSprojection_frame #--------------------------# #--------------------------# # t t t # name +# void void oid # type +#--------------------------# +#--------------------------# +# t t t # name +# void void oid # type +#--------------------------# +[ 0@0, 0@0, 0@0 ] +[ 1@0, 1@0, 1@0 ] +[ 2@0, 2@0, 2@0 ] +[ 3@0, 3@0, 3@0 ] +[ 4@0, 4@0, 4@0 ] +[ 5@0, 5@0, 5@0 ] +[ 6@0, 6@0, 6@0 ] +[ 7@0, 7@0, 7@0 ] +[ 8@0, 8@0, 8@0 ] +[ 9@0, 9@0, 9@0 ] +[ 10@0, 10@0, 10@0 ] +[ 11@0, 11@0, 11@0 ] +[ 12@0, 12@0, 12@0 ] +[ 13@0, 13@0, 13@0 ] +[ 14@0, 14@0, 14@0 ] +[ 15@0, 15@0, 15@0 ] +[ 16@0, 16@0, 16@0 ] +[ 17@0, 17@0, 17@0 ] +[ 18@0, 18@0, 18@0 ] +[ 19@0, 19@0, 19@0 ] +[ 20@0, 20@0, 20@0 ] +[ 21@0, 21@0, 21@0 ] +[ 22@0, 22@0, 22@0 ] +[ 23@0, 23@0, 23@0 ] +[ 24@0, 24@0, 24@0 ] +[ 25@0, 25@0, 25@0 ] +[ 26@0, 26@0, 26@0 ] +[ 27@0, 27@0, 27@0 ] +[ 28@0, 28@0, 28@0 ] +[ 29@0, 29@0, 29@0 ] +[ 30@0, 30@0, 30@0 ] +[ 31@0, 31@0, 31@0 ] +[ 32@0, 32@0, 32@0 ] +[ 33@0, 33@0, 33@0 ] +[ 34@0, 34@0, 34@0 ] +[ 35@0, 35@0, 35@0 ] +[ 36@0, 36@0, 36@0 ] +[ 37@0, 37@0, 37@0 ] +[ 38@0, 38@0, 38@0 ] +[ 39@0, 39@0, 39@0 ] +[ 40@0, 40@0, 40@0 ] +[ 41@0, 41@0, 41@0 ] +[ 42@0, 42@0, 42@0 ] +[ 43@0, 43@0, 43@0 ] +[ 44@0, 44@0, 44@0 ] +[ 45@0, 45@0, 45@0 ] +[ 46@0, 46@0, 46@0 ] +[ 47@0, 47@0, 47@0 ] +[ 48@0, 48@0, 48@0 ] +[ 49@0, 49@0, 49@0 ] +[ 50@0, 50@0, 50@0 ] +[ 51@0, 51@0, 51@0 ] +[ 52@0, 52@0, 52@0 ] +[ 53@0, 53@0, 53@0 ] +[ 54@0, 54@0, 54@0 ] +[ 55@0, 55@0, 55@0 ] +[ 56@0, 56@0, 56@0 ] +[ 57@0, 57@0, 57@0 ] +[ 58@0, 58@0, 58@0 ] +#--------------------------# +# t t t # name # void oid oid # type #--------------------------# [ 0@0, 0@0, 0@0 ] diff --git a/monetdb5/modules/mosaic/Tests/mosaic_bit_1.mal b/monetdb5/modules/mosaic/Tests/mosaic_bit_1.mal --- a/monetdb5/modules/mosaic/Tests/mosaic_bit_1.mal +++ b/monetdb5/modules/mosaic/Tests/mosaic_bit_1.mal @@ -138,6 +138,14 @@ sa:= algebra.select(a,true:bit, true:bit sc:= mosaic.select (c,true:bit, true:bit,true,false,false); io.print(sa, sc); +sa:= algebra.select(a,true:bit, false:bit,true,false,false); +sc:= mosaic.select (c,true:bit, false:bit,true,false,false); +io.print(sa, sc); + +sa:= algebra.select(a,true:bit, false:bit,true,false,true); +sc:= mosaic.select (c,true:bit, false:bit,true,false,true); +io.print(sa, sc); + sa:= algebra.select(a,false:bit, true:bit,true,false,false); sc:= mosaic.select (c,false:bit, true:bit,true,false,false); io.print(sa, sc); diff --git a/monetdb5/modules/mosaic/Tests/mosaic_bit_1.prefix.stable.out b/monetdb5/modules/mosaic/Tests/mosaic_bit_1.prefix.stable.out --- a/monetdb5/modules/mosaic/Tests/mosaic_bit_1.prefix.stable.out +++ b/monetdb5/modules/mosaic/Tests/mosaic_bit_1.prefix.stable.out @@ -50,6 +50,8 @@ MOSselect_prefix MOSselect_prefix MOSselect_prefix MOSselect_prefix +MOSselect_prefix +MOSselect_prefix MOSthetaselect_prefix MOSselect_prefix MOSthetaselect_prefix @@ -539,6 +541,73 @@ MOSprojection_prefix #--------------------------# #--------------------------# # t t t # name +# void void oid # type +#--------------------------# +#--------------------------# +# t t t # name +# void void oid # type +#--------------------------# +[ 0@0, 0@0, 0@0 ] +[ 1@0, 1@0, 1@0 ] +[ 2@0, 2@0, 2@0 ] +[ 3@0, 3@0, 3@0 ] +[ 4@0, 4@0, 4@0 ] +[ 5@0, 5@0, 5@0 ] +[ 6@0, 6@0, 6@0 ] +[ 7@0, 7@0, 7@0 ] +[ 8@0, 8@0, 8@0 ] +[ 9@0, 9@0, 9@0 ] +[ 10@0, 10@0, 10@0 ] +[ 11@0, 11@0, 11@0 ] +[ 12@0, 12@0, 12@0 ] +[ 13@0, 13@0, 13@0 ] +[ 14@0, 14@0, 14@0 ] +[ 15@0, 15@0, 15@0 ] +[ 16@0, 16@0, 16@0 ] +[ 17@0, 17@0, 17@0 ] +[ 18@0, 18@0, 18@0 ] +[ 19@0, 19@0, 19@0 ] +[ 20@0, 20@0, 20@0 ] +[ 21@0, 21@0, 21@0 ] +[ 22@0, 22@0, 22@0 ] +[ 23@0, 23@0, 23@0 ] +[ 24@0, 24@0, 24@0 ] +[ 25@0, 25@0, 25@0 ] +[ 26@0, 26@0, 26@0 ] +[ 27@0, 27@0, 27@0 ] +[ 28@0, 28@0, 28@0 ] +[ 29@0, 29@0, 29@0 ] +[ 30@0, 30@0, 30@0 ] +[ 31@0, 31@0, 31@0 ] +[ 32@0, 32@0, 32@0 ] +[ 33@0, 33@0, 33@0 ] +[ 34@0, 34@0, 34@0 ] +[ 35@0, 35@0, 35@0 ] +[ 36@0, 36@0, 36@0 ] +[ 37@0, 37@0, 37@0 ] +[ 38@0, 38@0, 38@0 ] +[ 39@0, 39@0, 39@0 ] +[ 40@0, 40@0, 40@0 ] +[ 41@0, 41@0, 41@0 ] +[ 42@0, 42@0, 42@0 ] +[ 43@0, 43@0, 43@0 ] +[ 44@0, 44@0, 44@0 ] +[ 45@0, 45@0, 45@0 ] +[ 46@0, 46@0, 46@0 ] +[ 47@0, 47@0, 47@0 ] +[ 48@0, 48@0, 48@0 ] +[ 49@0, 49@0, 49@0 ] +[ 50@0, 50@0, 50@0 ] +[ 51@0, 51@0, 51@0 ] +[ 52@0, 52@0, 52@0 ] +[ 53@0, 53@0, 53@0 ] +[ 54@0, 54@0, 54@0 ] +[ 55@0, 55@0, 55@0 ] +[ 56@0, 56@0, 56@0 ] +[ 57@0, 57@0, 57@0 ] +[ 58@0, 58@0, 58@0 ] +#--------------------------# +# t t t # name # void oid oid # type #--------------------------# [ 0@0, 0@0, 0@0 ] diff --git a/monetdb5/modules/mosaic/Tests/mosaic_bit_1.raw.stable.out b/monetdb5/modules/mosaic/Tests/mosaic_bit_1.raw.stable.out --- a/monetdb5/modules/mosaic/Tests/mosaic_bit_1.raw.stable.out +++ b/monetdb5/modules/mosaic/Tests/mosaic_bit_1.raw.stable.out @@ -50,6 +50,8 @@ MOSselect_raw MOSselect_raw MOSselect_raw MOSselect_raw +MOSselect_raw +MOSselect_raw MOSthetaselect_raw MOSselect_raw MOSthetaselect_raw @@ -539,6 +541,73 @@ MOSprojection_raw #--------------------------# #--------------------------# # t t t # name +# void void oid # type +#--------------------------# +#--------------------------# +# t t t # name +# void void oid # type +#--------------------------# +[ 0@0, 0@0, 0@0 ] +[ 1@0, 1@0, 1@0 ] _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
