From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-f196.google.com (mail-lj1-f196.google.com [209.85.208.196]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id DD20F4696C3 for ; Thu, 9 Apr 2020 14:07:58 +0300 (MSK) Received: by mail-lj1-f196.google.com with SMTP id m8so2782152lji.1 for ; Thu, 09 Apr 2020 04:07:58 -0700 (PDT) Date: Thu, 9 Apr 2020 14:07:56 +0300 From: Konstantin Osipov Message-ID: <20200409110756.GC29198@atlas> References: <20200409081822.GA21437@atlas> <20200409105556.GA3864@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200409105556.GA3864@tarantool.org> Subject: Re: [Tarantool-patches] [PATCH 1/2] vinyl: init all vars before cleanup in vy_lsm_split_range() List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Nikita Pettik Cc: tarantool-patches@dev.tarantool.org, v.shpilevoy@tarantool.org * Nikita Pettik [20/04/09 14:00]: > On 09 Apr 11:18, Konstantin Osipov wrote: > > * Nikita Pettik [20/04/09 00:39]: > > > > > + struct errinj *inj = errinj(ERRINJ_VY_MAX_TUPLE_SIZE, ERRINJ_INT); > > > + if (inj != NULL && inj->iparam >= 0) { > > > + if (inj->iparam-- == 0) > > > + total_size = vy_max_tuple_size + 1; > > > + } > > > > shouldn't this be under #ifdef > > Looks like not: most of other errinj() calls are not wrapped in > #ifdef NDEBUG macro (in case of debug build errinj() always > returns NULL). In most cases the compiler can optimize these away, but the rules are complicated. Regarding other uses of errinj() one should take into consideration whether it's a hot path or not, whether the code in which injection is used is small/simple or not, etc. I'd say as a rule of thumb anything using errinj and is multiline is better off using #ifdef. > > The patch is LGTM, please solicit another review. -- Konstantin Osipov, Moscow, Russia https://scylladb.com