On 2012-01-11 23:22, Jennie Zhang wrote: > Changeset: d42756602492 for MonetDB > URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d42756602492 > Modified Files: > sql/server/rel_exp.c > sql/server/rel_exp.h > Branch: sciql > Log Message: > > Add two new functions to create an sql_exp* for flt and dbl type atoms. > > This change should be propagated to the default branch, but how?
Use hg transplant.
>
>
> diffs (40 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
> @@ -222,6 +222,24 @@ exp_atom_wrd(sql_allocator *sa, wrd w)
> }
>
> sql_exp *
> +exp_atom_flt(sql_allocator *sa, flt f)
> +{
> + sql_subtype it;
> +
> + sql_find_subtype(&it, "double", 24, 0);
> + return exp_atom(sa, atom_float(sa, &it, (dbl)f ));
> +}
> +
> +sql_exp *
> +exp_atom_dbl(sql_allocator *sa, dbl f)
> +{
> + sql_subtype it;
> +
> + sql_find_subtype(&it, "double", 53, 0);
> + return exp_atom(sa, atom_float(sa, &it, (dbl)f ));
> +}
> +
> +sql_exp *
> exp_atom_str(sql_allocator *sa, str s, sql_subtype *st)
> {
> return exp_atom(sa, atom_string(sa, st, s?sa_strdup(sa, s):NULL));
> 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
> @@ -53,6 +53,8 @@ extern sql_exp * exp_atom_bool(sql_alloc
> extern sql_exp * exp_atom_int(sql_allocator *sa, int i);
> extern sql_exp * exp_atom_lng(sql_allocator *sa, lng l);
> extern sql_exp * exp_atom_wrd(sql_allocator *sa, wrd w);
> +extern sql_exp * exp_atom_flt(sql_allocator *sa, flt f);
> +extern sql_exp * exp_atom_dbl(sql_allocator *sa, dbl d);
> extern sql_exp * exp_atom_str(sql_allocator *sa, str s, sql_subtype *st);
> extern sql_exp * exp_atom_clob(sql_allocator *sa, str s);
> extern sql_exp * exp_atom_ptr(sql_allocator *sa, void *s);
> _______________________________________________
> Checkin-list mailing list
> [email protected]
> http://mail.monetdb.org/mailman/listinfo/checkin-list
--
Sjoerd Mullender
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
