MonetDB: Nov2019 - Use unsigned int for card field in sql_exp

[Pedro Ferreira]

Changeset: 3342800d02a2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3342800d02a2
Modified Files:
        sql/server/rel_exp.c
        sql/server/rel_exp.h
Branch: Nov2019
Log Message:

Use unsigned int for card field in sql_exp


diffs (108 lines):

diff --git a/sql/server/rel_exp.c b/sql/server/rel_exp.c
--- a/sql/server/rel_exp.c
+++ b/sql/server/rel_exp.c
@@ -230,7 +230,7 @@ exp_op( sql_allocator *sa, list *l, sql_
 }
 
 sql_exp * 
-exp_aggr( sql_allocator *sa, list *l, sql_subaggr *a, int distinct, int 
no_nils, int card, int has_nils )
+exp_aggr( sql_allocator *sa, list *l, sql_subaggr *a, int distinct, int 
no_nils, unsigned int card, int has_nils )
 {
        sql_exp *e = exp_create(sa, e_aggr);
        if (e == NULL)
@@ -469,7 +469,7 @@ have_nil(list *exps)
 }
 
 sql_exp * 
-exp_column(sql_allocator *sa, const char *rname, const char *cname, 
sql_subtype *t, int card, int has_nils, int intern) 
+exp_column(sql_allocator *sa, const char *rname, const char *cname, 
sql_subtype *t, unsigned int card, int has_nils, int intern) 
 {
        sql_exp *e = exp_create(sa, e_column);
 
@@ -504,7 +504,7 @@ exp_propagate(sql_allocator *sa, sql_exp
 }
 
 sql_exp * 
-exp_alias(sql_allocator *sa, const char *arname, const char *acname, const 
char *org_rname, const char *org_cname, sql_subtype *t, int card, int has_nils, 
int intern) 
+exp_alias(sql_allocator *sa, const char *arname, const char *acname, const 
char *org_rname, const char *org_cname, sql_subtype *t, unsigned int card, int 
has_nils, int intern) 
 {
        sql_exp *e = exp_column(sa, org_rname, org_cname, t, card, has_nils, 
intern);
 
@@ -833,7 +833,7 @@ exp_find_rel_name(sql_exp *e)
        return NULL;
 }
 
-int
+unsigned int
 exp_card( sql_exp *e )
 {
        return e->card;
@@ -1809,20 +1809,20 @@ exps_card( list *l )
 }
        
 void
-exps_fix_card( list *exps, int card)
+exps_fix_card( list *exps, unsigned int card)
 {
        node *n;
 
        for (n = exps->h; n; n = n->next) {
                sql_exp *e = n->data;
 
-               if (e->card > (unsigned) card)
+               if (e->card > card)
                        e->card = card;
        }
 }
 
 void
-exps_setcard( list *exps, int card)
+exps_setcard( list *exps, unsigned int card)
 {
        node *n;
 
diff --git a/sql/server/rel_exp.h b/sql/server/rel_exp.h
--- a/sql/server/rel_exp.h
+++ b/sql/server/rel_exp.h
@@ -44,7 +44,7 @@ extern sql_exp *exp_op(sql_allocator *sa
        exp_op(sa, append(append(append(new_exp_list(sa),l),r),r2), f)
 #define exp_op4(sa,l,r,r2,r3,f) \
        exp_op(sa, append(append(append(append(new_exp_list(sa),l),r),r2),r3), 
f)
-extern sql_exp *exp_aggr(sql_allocator *sa, list *l, sql_subaggr *a, int 
distinct, int no_nils, int card, int has_nil );
+extern sql_exp *exp_aggr(sql_allocator *sa, list *l, sql_subaggr *a, int 
distinct, int no_nils, unsigned int card, int has_nil );
 #define exp_aggr1(sa, e, a, d, n, c, hn) \
        exp_aggr(sa, append(new_exp_list(sa), e), a, d, n, c, hn)
 extern sql_exp * exp_atom(sql_allocator *sa, atom *a);
@@ -70,10 +70,10 @@ extern sql_exp * exp_values(sql_allocato
 extern list * exp_types(sql_allocator *sa, list *exps);
 extern int have_nil(list *exps);
 
-extern sql_exp * exp_column(sql_allocator *sa, const char *rname, const char 
*name, sql_subtype *t, int card, int has_nils, int intern);
+extern sql_exp * exp_column(sql_allocator *sa, const char *rname, const char 
*name, sql_subtype *t, unsigned int card, int has_nils, int intern);
 extern sql_exp * exp_propagate(sql_allocator *sa, sql_exp *ne, sql_exp *oe);
 #define exp_ref(sa, e) exp_propagate(sa, exp_column(sa, exp_relname(e), 
exp_name(e), exp_subtype(e), exp_card(e), has_nil(e), is_intern(e)), e)
-extern sql_exp * exp_alias(sql_allocator *sa, const char *arname, const char 
*acname, const char *org_rname, const char *org_cname, sql_subtype *t, int 
card, int has_nils, int intern);
+extern sql_exp * exp_alias(sql_allocator *sa, const char *arname, const char 
*acname, const char *org_rname, const char *org_cname, sql_subtype *t, unsigned 
int card, int has_nils, int intern);
 extern sql_exp * exp_alias_or_copy( mvc *sql, const char *tname, const char 
*cname, sql_rel *orel, sql_exp *old);
 extern sql_exp * exp_set(sql_allocator *sa, const char *name, sql_exp *val, 
int level);
 extern sql_exp * exp_var(sql_allocator *sa, const char *name, sql_subtype 
*type, int level);
@@ -105,7 +105,7 @@ extern sql_subtype * exp_subtype( sql_ex
 extern const char * exp_name( sql_exp *e );
 extern const char * exp_relname( sql_exp *e );
 extern const char * exp_func_name( sql_exp *e );
-extern int exp_card(sql_exp *e);
+extern unsigned int exp_card(sql_exp *e);
 
 extern const char *exp_find_rel_name(sql_exp *e);
 
@@ -151,8 +151,8 @@ extern sql_exp *exps_bind_column2( list 
 extern sql_exp *exps_bind_alias( list *exps, const char *rname, const char 
*cname);
 
 extern unsigned int exps_card( list *l );
-extern void exps_fix_card( list *exps, int card);
-extern void exps_setcard( list *exps, int card);
+extern void exps_fix_card( list *exps, unsigned int card);
+extern void exps_setcard( list *exps, unsigned int card);
 extern int exps_intern(list *exps);
 
 extern char *compare_func( comp_type t, int anti );
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list