MonetDB: default - try to fix DataCell compilation error, by sim...

Martin Kersten Martin.Kersten at cwi.nl
Mon Jan 28 17:15:03 CET 2013


Yes, that is correct.

On 1/28/13 5:10 PM, Jennie Zhang wrote:
> Changeset: 50111ec8e490 for MonetDB
> URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=50111ec8e490
> Modified Files:
> 	sql/backends/monet5/datacell/basket.c
> Branch: default
> Log Message:
>
> try to fix DataCell compilation error, by simply removing the unused variable that causes the problem.
>
> Mtest shows this change doesn't make the code worse.
>
> @Martin: please double check!
>
>
> diffs (24 lines):
>
> diff --git a/sql/backends/monet5/datacell/basket.c b/sql/backends/monet5/datacell/basket.c
> --- a/sql/backends/monet5/datacell/basket.c
> +++ b/sql/backends/monet5/datacell/basket.c
> @@ -41,10 +41,6 @@ str protocolname[4] = { "<unknown>", "TC
>
>   BSKTbasketRec *baskets;   /* the datacell catalog */
>   int bsktTop = 0, bsktLimit = 0;
> -static MT_Lock bsktLock MT_LOCK_INITIALIZER("bsktLock");
> -
> -#define lockBSKTbasketCatalog() MT_lock_set(&bsktLock, "basket");
> -#define unlockBSKTbasketCatalog() MT_lock_unset(&bsktLock, "basket");
>
>   /* We have to obtain the precise wall-clock time
>    * This is not produced by GDKusec, which returns microseconds
> @@ -90,9 +86,6 @@ static int BSKTnewEntry(void)
>   	if (bsktLimit == 0) {
>   		bsktLimit = MAXBSK;
>   		baskets = (BSKTbasketRec *) GDKzalloc(bsktLimit * sizeof(BSKTbasketRec));
> -#ifdef NEED_MT_LOCK_INIT
> -		MT_lock_init(&bsktLock, "basket");
> -#endif
>   		bsktTop = 1; /* entry 0 is used as non-initialized */
>   	} else if (bsktTop == bsktLimit) {
>   		bsktLimit += MAXBSK;
> _______________________________________________
> checkin-list mailing list
> checkin-list at monetdb.org
> http://mail.monetdb.org/mailman/listinfo/checkin-list
>




More information about the developers-list mailing list