MonetDB: mosaic - Fix merge conflict.

Martin Kersten Martin.Kersten at cwi.nl
Fri Dec 12 12:27:51 CET 2014


Thank you for taking the initiative.

On 12/12/14 11:03, Sjoerd Mullender wrote:
> Changeset: 3e1d5cbd649d for MonetDB
> URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3e1d5cbd649d
> Modified Files:
> 	sql/server/rel_optimizer.c
> Branch: mosaic
> Log Message:
>
> Fix merge conflict.
>
>
> diffs (21 lines):
>
> diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
> --- a/sql/server/rel_optimizer.c
> +++ b/sql/server/rel_optimizer.c
> @@ -6426,7 +6426,7 @@ rel_merge_table_rewrite(int *changes, mv
>
>   					/* do not include empty partitions */
>   					if ((nrel || nt->next) &&
> -					   pt && isTable(pt) && pt->readonly && !store_funcs.count_col(sql->session->tr, pt->columns.set->h->data, 1)){
> +					   pt && isTable(pt) && pt->access == TABLE_READONLY && !store_funcs.count_col(sql->session->tr, pt->columns.set->h->data, 1)){
>   						continue;
>   					}
>
> @@ -6439,7 +6439,7 @@ rel_merge_table_rewrite(int *changes, mv
>   						sql_exp *ne = m->data;
>   						int i;
>
> -						if (pt && isTable(pt) && pt->readonly && sel && (nrel || nt->next) && (i=find_col_exp(cols, e)) != -1) {
> +						if (pt && isTable(pt) && pt->access == TABLE_READONLY && sel && (nrel || nt->next) && (i=find_col_exp(cols, e)) != -1) {
>   							/* check if incase of an expression if the part falls within the bounds else skip this (keep at least on part-table) */
>   							void *min, *max;
>   							sql_column *col = NULL;
> _______________________________________________
> checkin-list mailing list
> checkin-list at monetdb.org
> https://www.monetdb.org/mailman/listinfo/checkin-list
>




More information about the developers-list mailing list