[Tarantool-patches] [PATCH v1 19/21] sql: remove MEM_Dyn flag

Vladislav Shpilevoy v.shpilevoy at tarantool.org
Fri Oct 15 01:46:09 MSK 2021


Thanks for the patch!

> diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c
> index 895003580..a001ac8c5 100644
> --- a/src/box/sql/mem.c
> +++ b/src/box/sql/mem.c
> @@ -2689,15 +2623,12 @@ sqlVdbeMemPrettyPrint(Mem *pMem, char *zBuf)
>  	if (pMem->type == MEM_TYPE_BIN) {
>  		int i;
>  		char c;
> -		if (f & MEM_Dyn) {
> -			c = 'z';
> -			assert((f & (MEM_Static|MEM_Ephem))==0);
> -		} else if (f & MEM_Static) {
> +		if (f & MEM_Static) {

1. != 0.

>  			c = 't';
> -			assert((f & (MEM_Dyn|MEM_Ephem))==0);
> +			assert((f & MEM_Ephem) == 0);
>  		} else if (f & MEM_Ephem) {
>  			c = 'e';
> -			assert((f & (MEM_Static|MEM_Dyn))==0);
> +			assert((f & MEM_Static) == 0);
>  		} else {
>  			c = 's';
>  		}
> @@ -2721,15 +2652,12 @@ sqlVdbeMemPrettyPrint(Mem *pMem, char *zBuf)
>  	} else if (pMem->type == MEM_TYPE_STR) {
>  		int j, k;
>  		zBuf[0] = ' ';
> -		if (f & MEM_Dyn) {
> -			zBuf[1] = 'z';
> -			assert((f & (MEM_Static|MEM_Ephem))==0);
> -		} else if (f & MEM_Static) {
> +		if (f & MEM_Static) {

2. != 0.

>  			zBuf[1] = 't';
> -			assert((f & (MEM_Dyn|MEM_Ephem))==0);
> +			assert((f & MEM_Ephem)==0);
>  		} else if (f & MEM_Ephem) {
>  			zBuf[1] = 'e';
> -			assert((f & (MEM_Static|MEM_Dyn))==0);
> +			assert((f & MEM_Static)==0);

3. Spaces around == here and above.


More information about the Tarantool-patches mailing list