MonetDB: default - Merge with Oct2014 branch.

Sjoerd Mullender sjoerd at monetdb.org
Mon Oct 27 11:42:46 CET 2014


On 27/10/14 11:24, Lefteris wrote:
> tab space = 8 for gdk?

Yes.

> On Mon, Oct 27, 2014 at 11:02 AM, Sjoerd Mullender <commits at monetdb.org>
> wrote:
> 
>> Changeset: dfe9b28b23db for MonetDB
>> URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dfe9b28b23db
>> Modified Files:
>>         gdk/gdk_imprints.c
>>         gdk/gdk_select.c
>> Branch: default
>> Log Message:
>>
>> Merge with Oct2014 branch.
>>
>>
>> diffs (108 lines):
>>
>> diff --git a/gdk/gdk_imprints.c b/gdk/gdk_imprints.c
>> --- a/gdk/gdk_imprints.c
>> +++ b/gdk/gdk_imprints.c
>> @@ -453,12 +453,12 @@ do {
>>                       \
>>                 }                                                       \
>>                 GETBIN##B(bin,col[i]);                                  \
>>                 mask = IMPSsetBit(B,mask,bin);                          \
>> -               if (col[i] != nil) { /* do not count nils */
>>       \
>> -                       if (!cnt_bins[bin]++) {
>>      \
>> -                               min_bins[bin] = max_bins[bin] = i;
>>       \
>> -                       } else {
>>                                                       \
>> -                               if (col[i] < col[min_bins[bin]])
>> min_bins[bin] = i;     \
>> -                               if (col[i] > col[max_bins[bin]])
>> max_bins[bin] = i;     \
>> +               if (col[i] != nil) { /* do not count nils */            \
>> +                       if (!cnt_bins[bin]++) {                         \
>> +                               min_bins[bin] = max_bins[bin] = i;      \
>> +                       } else {                                        \
>> +                               if (col[i] < col[min_bins[bin]])
>> min_bins[bin] = i; \
>> +                               if (col[i] > col[max_bins[bin]])
>> max_bins[bin] = i; \
>>                         }                                               \
>>                 }                                                       \
>>         }                                                               \
>> diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
>> --- a/gdk/gdk_select.c
>> +++ b/gdk/gdk_select.c
>> @@ -341,27 +341,27 @@ do {
>>                       \
>>         }                                                               \
>>  } while (0)
>>
>> -#define checkMINMAX(B)
>>                                              \
>> -do {
>>                                                              \
>> -       int ii;
>>                                                              \
>> -       BUN *imp_cnt = (BUN *) (((oid *)imprints->stats)+128);
>>               \
>> -       imp_min = imp_max = nil;
>>                                               \
>> -       for (ii = 0; ii < B; ii++) {
>>                                       \
>> -               if ((imp_min == nil) && (imp_cnt[ii])) {
>>                               \
>> -                       imp_min = src[((oid *)imprints->stats)[ii]];
>>                       \
>> -               }
>>                                                                      \
>> -               if ((imp_max == nil) && (imp_cnt[B-1-ii])) {
>>                       \
>> -                       imp_max = src[(((oid
>> *)imprints->stats)+64)[B-1-ii]];           \
>> -               }
>>                                                                      \
>> -       }
>>                                                                      \
>> -       assert((imp_min != nil) && (imp_max != nil));
>>                      \
>> -       if (!s && !VIEWtparent(b)) { /* no candidate list and no views*/
>>       \
>> -               if ((vl > imp_max || vh < imp_min) ||
>>                              \
>> -                       (anti && (vl < imp_min && vh > imp_max))) {
>>                              \
>> -               return 0;
>>                                                              \
>> -               }
>>                                                                      \
>> -       }
>>                                                                      \
>> -} while (0)
>>                                                               \
>> +#define checkMINMAX(B)                                                 \
>> +do {                                                                   \
>> +       int ii;                                                         \
>> +       BUN *imp_cnt = (BUN *) (((oid *)imprints->stats)+128);          \
>> +       imp_min = imp_max = nil;                                        \
>> +       for (ii = 0; ii < B; ii++) {                                    \
>> +               if ((imp_min == nil) && (imp_cnt[ii])) {                \
>> +                       imp_min = src[((oid *)imprints->stats)[ii]];    \
>> +               }                                                       \
>> +               if ((imp_max == nil) && (imp_cnt[B-1-ii])) {            \
>> +                       imp_max = src[(((oid
>> *)imprints->stats)+64)[B-1-ii]]; \
>> +               }                                                       \
>> +       }                                                               \
>> +       assert((imp_min != nil) && (imp_max != nil));                   \
>> +       if (!s && !VIEWtparent(b)) { /* no candidate list and no views*/ \
>> +               if ((vl > imp_max || vh < imp_min) ||                   \
>> +                       (anti && (vl < imp_min && vh > imp_max))) {     \
>> +               return 0;                                               \
>> +               }                                                       \
>> +       }                                                               \
>> +} while (0)
>>
>>  /* choose number of bits */
>>  #define bitswitch(CAND,TEST)                                           \
>> @@ -374,10 +374,10 @@ do {
>>                       \
>>                           s && BATtdense(s) ? "(dense)" : "",           \
>>                           anti, #TEST);                                 \
>>         switch (imprints->bits) {                                       \
>> -       case 8:  checkMINMAX(8); impsmask(CAND,TEST,8); break;
>>               \
>> -       case 16: checkMINMAX(16); impsmask(CAND,TEST,16); break;
>>                       \
>> -       case 32: checkMINMAX(32); impsmask(CAND,TEST,32); break;
>>                       \
>> -       case 64: checkMINMAX(64); impsmask(CAND,TEST,64); break;
>>                       \
>> +       case 8:  checkMINMAX(8); impsmask(CAND,TEST,8); break;          \
>> +       case 16: checkMINMAX(16); impsmask(CAND,TEST,16); break;        \
>> +       case 32: checkMINMAX(32); impsmask(CAND,TEST,32); break;        \
>> +       case 64: checkMINMAX(64); impsmask(CAND,TEST,64); break;        \
>>         default: assert(0); break;                                      \
>>         }                                                               \
>>  } while (0)
>> @@ -484,13 +484,13 @@ NAME##_##TYPE (BAT *b, BAT *s, BAT *bn,
>>  {                                                                      \
>>         TYPE vl = *(const TYPE *) tl;                                   \
>>         TYPE vh = *(const TYPE *) th;                                   \
>> -       TYPE imp_min;
>>              \
>> -       TYPE imp_max;
>>              \
>> -       TYPE v;
>>                      \
>> -       TYPE nil = TYPE##_nil;
>>       \
>> +       TYPE imp_min;                                                   \
>> +       TYPE imp_max;                                                   \
>> +       TYPE v;                                                         \
>> +       TYPE nil = TYPE##_nil;                                          \
>>         TYPE minval = MINVALUE##TYPE;                                   \
>>         TYPE maxval = MAXVALUE##TYPE;                                   \
>> -       const TYPE *src = (const TYPE *) Tloc(b, 0);    \
>> +       const TYPE *src = (const TYPE *) Tloc(b, 0);                    \
>>         oid o;                                                          \
>>         BUN w, p = r;                                                   \
>>         BUN pr_off = 0;                                                 \
>> _______________________________________________
>> checkin-list mailing list
>> checkin-list at monetdb.org
>> https://www.monetdb.org/mailman/listinfo/checkin-list
>>
> 
> 
> 
> _______________________________________________
> developers-list mailing list
> developers-list at monetdb.org
> https://www.monetdb.org/mailman/listinfo/developers-list
> 


-- 
Sjoerd Mullender

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 291 bytes
Desc: OpenPGP digital signature
URL: <http://www.monetdb.org/pipermail/developers-list/attachments/20141027/6597cfe2/attachment.sig>


More information about the developers-list mailing list