From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id F2FA66EC55; Sat, 31 Jul 2021 01:58:56 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org F2FA66EC55 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1627685937; bh=i938NpvrOCmq3Y4eESAiQQoNieRmtsESvC4hm6cpg04=; h=To:Cc:References:In-Reply-To:Date:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=MmCQ1G5f0+4ND7sFS9NOba5zNUX/D81IR3vCRQyJvvVEk12aGr2ys6SWZ+bERZzXg sPknE9Uv/+DOTLga7J5HelkMz1l8KPyFlVGIrjkD2KB8ssH700q/FgmG64VDzdOdKf NgfTa0F8FBB5y8fPl4ShQ/4Lb8SJ/1Ai6ySk3I9k= Received: from smtp56.i.mail.ru (smtp56.i.mail.ru [217.69.128.36]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id ED2A46EC55 for ; Sat, 31 Jul 2021 01:58:54 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org ED2A46EC55 Received: by smtp56.i.mail.ru with esmtpa (envelope-from ) id 1m9bSv-0001dB-TM; Sat, 31 Jul 2021 01:58:54 +0300 To: "'Oleg Babin'" , Cc: References: <072bcee03a63600d918b18cd2863b7c36f666072.1627468002.git.tsafin@tarantool.org> In-Reply-To: Date: Sat, 31 Jul 2021 01:58:52 +0300 Message-ID: <045901d78596$784a68d0$68df3a70$@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Mailer: Microsoft Outlook 16.0 Thread-Index: AQNJI0ot4YBfKbZyj2tYNprdOv6c+gECRExIAgjkBOCoX4FMQA== Content-Language: ru X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD941C43E597735A9C3104FC76DFAAAAF7DA068FE323FAC4379182A05F538085040DC38631F2810BFE90C6CF181DF4F0365A109F33588BD7C3A325803A4BD575996 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE701173C01F417A2A6EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006379C6642364E0E74208638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D82B0ECB89D04F17CAFCDB080E0F5BC3F2117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCAA867293B0326636D2E47CDBA5A96583BD4B6F7A4D31EC0BC014FD901B82EE079FA2833FD35BB23D27C277FBC8AE2E8BAA867293B0326636D2E47CDBA5A96583BA9C0B312567BB2376E601842F6C81A19E625A9149C048EE652FD71AFB96DC7DCFA063A519E5965DD8FC6C240DEA7642DBF02ECDB25306B2B78CF848AE20165D0A6AB1C7CE11FEE3632EDEA9CD5989A3AD7EC71F1DB88427C4224003CC836476EA7A3FFF5B025636E2021AF6380DFAD1A18204E546F3947CB11811A4A51E3B096D1867E19FE1407959CC434672EE6371089D37D7C0E48F6C8AA50765F7900637B8F435DEDE9E76EBEFF80C71ABB335746BA297DBC24807EABDAD6C7F3747799A X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A213B5FB47DCBC3458F0AFF96BAACF4158235E5A14AD4A4A4625E192CAD1D9E79DB53CE8437368708931C832882B85C6D0 X-C1DE0DAB: 0D63561A33F958A541434AEAA9140C94CC42DFAE3272111109BD1CC52CA846ABD59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA751B940EDA0DFB0535410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D346B1FF97F6D0959A2E005A6596DBC666E3654C34B340070D8108816D41B20333F842D6B5A46F1EE9B1D7E09C32AA3244C8E46AC55C1AF63465095C4CB07FB3AC7853296C06374E602FACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojWBddABnKmoKgu8Zkw+QaCw== X-Mailru-Sender: B5B6A6EBBD94DAD8DF9DB9650A8885C86B95261C76BAD37D93F197D4AE3C5B2B1BC7D605123C5CC91EC9E4A2C82A33BC8C24925A86E657CE0C70AEE3C9A96FBAB3D7EE8ED63280BE112434F685709FCF0DA7A0AF5A3A8387 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH resend v2 09/11] lua, datetime: time intervals support X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Timur Safin via Tarantool-patches Reply-To: Timur Safin Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Hi there! : From: Oleg Babin : Subject: Re: [Tarantool-patches] [PATCH resend v2 09/11] lua, = datetime: time : intervals support :=20 : Thanks for your patch. :=20 : I wrote several comments below. :=20 :=20 : However it makes me think that such approach will work quite slow = since :=20 : all functions is implemented in Lua, all arithmetic is in Lua. I'm not that pessimistic here :) [Given the fact that I'd remove Out of a loops all handy handlers table creation] But we need to measure it first.=20 :=20 :=20 ... : > @@ -158,58 +169,146 @@ local DT_EPOCH_1970_OFFSET =3D 719163LL : > : > local datetime_t =3D ffi.typeof('struct datetime_t') : > local interval_t =3D ffi.typeof('struct datetime_interval_t') : > +ffi.cdef [[ : > + struct t_interval_months { : > + int m; : > + }; : > + : > + struct t_interval_years { : > + int y; : > + }; : > +]] : > +local interval_months_t =3D ffi.typeof('struct t_interval_months') : > +local interval_years_t =3D ffi.typeof('struct t_interval_years') : > + : > +local function is_interval(o) : > + return ffi.istype(interval_t, o) or : > + ffi.istype(interval_months_t, o) or : > + ffi.istype(interval_years_t, o) : > +end : > + :=20 : It will throw for non-cdata values: :=20 : tarantool> ffi.istype(interval_t, o) : --- : - error: 'bad argument #1 to ''?'' (C type expected, got nil)' : ... :=20 : tarantool> ffi.istype(interval_t, 123) : --- : - error: 'bad argument #1 to ''?'' (C type expected, got nil)' : ... Yes, thanks for pin-pointing it! I've modified it this way to=20 avoid such errors: ------------------------------------------------ @@ -182,15 +181,19 @@ local interval_months_t =3D ffi.typeof('struct = t_interval_months') local interval_years_t =3D ffi.typeof('struct t_interval_years') =20 local function is_interval(o) - return ffi.istype(interval_t, o) or - ffi.istype(interval_months_t, o) or - ffi.istype(interval_years_t, o) + return type(o) =3D=3D 'cdata' and=20 + (ffi.istype(interval_t, o) or + ffi.istype(interval_months_t, o) or + ffi.istype(interval_years_t, o)) end =20 local function is_datetime(o) - return ffi.istype(o, datetime_t) + return type(o) =3D=3D 'cdata' and ffi.istype(o, datetime_t) end =20 +local function is_date_interval(o) + return is_datetime(o) or is_interval(o) +end =20 local function interval_new() local interval =3D ffi.new(interval_t) ------------------------------------------------ : > @@ -224,19 +323,123 @@ local function interval_serialize(self) : > return { secs =3D self.secs, nsec =3D self.nsec } : > end : > : > +local function local_rd(o) : > + return math.floor(tonumber(o.secs / SECS_PER_DAY)) + : DT_EPOCH_1970_OFFSET : > +end : > + : > +local function local_dt(o) : > + return cdt.dt_from_rdn(local_rd(o)) : > +end : > + : > +local function _normalize_nsec(secs, nsec) : > + if nsec < 0 then : > + secs =3D secs - 1 : > + nsec =3D nsec + NANOS_PER_SEC : > + elseif nsec >=3D NANOS_PER_SEC then : > + secs =3D secs + 1 : > + nsec =3D nsec - NANOS_PER_SEC : > + end : > + return secs, nsec : > +end : > + : > +-- addition or subtraction from date/time of a given interval : > +-- described via table direction should be +1 or -1 : > +local function interval_increment(self, o, direction) : > + assert(direction =3D=3D -1 or direction =3D=3D 1) : > + check_date(self, "interval_increment(date, object, -+1)") : > + assert(type(o) =3D=3D 'table') : > + : > + local ym_updated =3D false : > + local dhms_updated =3D false : > + : > + local dt =3D local_dt(self) : > + local secs, nsec : > + secs, nsec =3D self.secs, self.nsec : > + : > + for key, value in pairs(o) do : > + local handlers =3D { :=20 : The same as in one previous patch. It's too expensive to recreate = table : and functions for each simple :=20 : action and for each iteration loop. I've removed creation of a table, which is invariant in the loop, to outside of loop statement. Let me measure how it much would different than series of iffs.=20 --------------------------------------------------------- @@ -377,52 +382,52 @@ local function interval_increment(self, o, = direction) local secs, nsec secs, nsec =3D self.secs, self.nsec =20 + local handlers =3D { + years =3D function(k, v) + check_range(v, {0, 9999}, k) + dt =3D builtin.dt_add_years(dt, direction * v, = builtin.DT_LIMIT) + ym_updated =3D true + end, + + months =3D function(k, v) + check_range(v, {0, 12}, k) + dt =3D builtin.dt_add_months(dt, direction * v, = builtin.DT_LIMIT) + ym_updated =3D true + end, + + weeks =3D function(k, v) + check_range(v, {0, 52}, k) + secs =3D secs + direction * 7 * v * SECS_PER_DAY + dhms_updated =3D true + dhms_updated =3D true + end, + + days =3D function(k, v) + check_range(v, {0, 31}, k) + secs =3D secs + direction * v * SECS_PER_DAY + dhms_updated =3D true + end, + + hours =3D function(k, v) + check_range(v, {0, 23}, k) + secs =3D secs + direction * 60 * 60 * v + dhms_updated =3D true + end, + + minutes =3D function(k, v) + check_range(v, {0, 59}, k) + secs =3D secs + direction * 60 * v + end, + + seconds =3D function(k, v) + check_range(v, {0, 60}, k) + local s, frac =3D seconds_fraction(v) + secs =3D secs + direction * s + nsec =3D nsec + direction * frac * 1e9 -- convert fraction = to nanoseconds + dhms_updated =3D true + end, + } for key, value in pairs(o) do - local handlers =3D { - years =3D function(v) - check_range(v, {0, 9999}, key) - dt =3D cdt.dt_add_years(dt, direction * v, = cdt.DT_LIMIT) - ym_updated =3D true - end, - - months =3D function(v) - check_range(v, {0, 12}, key) - dt =3D cdt.dt_add_months(dt, direction * v, = cdt.DT_LIMIT) - ym_updated =3D true - end, - - weeks =3D function(v) - check_range(v, {0, 52}, key) - secs =3D secs + direction * 7 * v * SECS_PER_DAY - dhms_updated =3D true - end, - - days =3D function(v) - check_range(v, {0, 31}, key) - secs =3D secs + direction * v * SECS_PER_DAY - dhms_updated =3D true - end, - - hours =3D function(v) - check_range(v, {0, 23}, key) - secs =3D secs + direction * 60 * 60 * v - dhms_updated =3D true - end, - - minutes =3D function(v) - check_range(v, {0, 59}, key) - secs =3D secs + direction * 60 * v - end, - - seconds =3D function(v) - check_range(v, {0, 60}, key) - local s, frac =3D seconds_fraction(v) - secs =3D secs + direction * s - nsec =3D nsec + direction * frac * 1e9 -- convert = fraction to nanoseconds - dhms_updated =3D true - end, - } - handlers[key](value) + handlers[key](key, value) end =20 secs, nsec =3D _normalize_nsec(secs, nsec) --------------------------------------------------------- :=20 : > + years =3D function(v) : > + assert(v > 0 and v < 10000) : > + dt =3D cdt.dt_add_years(dt, direction * v, = cdt.DT_LIMIT) : > + ym_updated =3D true : > + end, : > + : > + months =3D function(v) : > + assert(v > 0 and v < 13 ) : > + dt =3D cdt.dt_add_months(dt, direction * v, = cdt.DT_LIMIT) : > + ym_updated =3D true : > + end, : > + : > + weeks =3D function(v) : > + assert(v > 0 and v < 32) : > + secs =3D secs + direction * 7 * v * SECS_PER_DAY : > + dhms_updated =3D true : > + end, : > + : > + days =3D function(v) : > + assert(v > 0 and v < 32) : > + secs =3D secs + direction * v * SECS_PER_DAY : > + dhms_updated =3D true : > + end, : > + : > + hours =3D function(v) : > + assert(v >=3D 0 and v < 24) : > + secs =3D secs + direction * 60 * 60 * v : > + dhms_updated =3D true : > + end, : > + : > + minutes =3D function(v) : > + assert(v >=3D 0 and v < 60) : > + secs =3D secs + direction * 60 * v : > + end, : > + : > + seconds =3D function(v) : > + assert(v >=3D 0 and v < 61) : > + local s, frac : > + frac =3D v % 1 : > + if frac > 0 then : > + s =3D v - (v % 1) : > + else : > + s =3D v : > + end : > + secs =3D secs + direction * s : > + nsec =3D nsec + direction * frac * 1e9 -- convert = fraction : to nanoseconds : > + dhms_updated =3D true : > + end, : > + } : > + handlers[key](value) : > + end : > + : > + secs, nsec =3D _normalize_nsec(secs, nsec) : > + : > + -- .days, .hours, .minutes, .seconds : > + if dhms_updated then : > + self.secs =3D secs : > + self.nsec =3D nsec : > + end : > + : > + -- .years, .months updated : > + if ym_updated then : > + self.secs =3D (cdt.dt_rdn(dt) - DT_EPOCH_1970_OFFSET) * : SECS_PER_DAY + : > + secs % SECS_PER_DAY : > + end : > + : > + return self : > +end : > + :=20 : tarantool> return require('datetime').now() + 1 : --- : - error: '[string "return require(''datetime'').now() + 1"]:1: Usage: : datetime:__add(interval)' : ... :=20 :=20 : Looks a bit confusing. User doesn't know about metamethods. Partially agreed. Though I assume that users of this code will=20 be educated enough. But in any case, what would be your suggested error message here?=20 Thanks, Timur