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 4F7146EC55; Wed, 28 Jul 2021 13:38:30 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 4F7146EC55 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1627468710; bh=ENXeYXEjWxlBckfX6arckFXu6u70WX1Aw2t2Mp2COCQ=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=PkJiXNGuByJ/gnADfgqusJNhvc3qetR9/2t6FOpybM1uG9sLodqOjeiJrsakG1/sk q/60yD8PTa5lSTeBZX541ai8fJydqrHHRqV/78w9kM7HbOPuo646rhqNDzlK0WYkjx KhVXb7eT/H4KIk1nEKDnizUOIBOoIRrTQH8BYOHg= Received: from smtp57.i.mail.ru (smtp57.i.mail.ru [217.69.128.37]) (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 1C2096EC55 for ; Wed, 28 Jul 2021 13:34:38 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 1C2096EC55 Received: by smtp57.i.mail.ru with esmtpa (envelope-from ) id 1m8gtV-0008Bz-3R; Wed, 28 Jul 2021 13:34:33 +0300 To: v.shpilevoy@tarantool.org Date: Wed, 28 Jul 2021 13:34:10 +0300 Message-Id: X-Mailer: git-send-email 2.29.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD941C43E597735A9C3104FC76DFAAAAF7DA068FE323FAC4379182A05F538085040564CA48DD4803DC4D0ECFDB02C033DF74219E2F33AF7FD9D03D35293BE43ADFC X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7AC4684DF4EC4B256EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637E0B09B181166DBFC8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8412AF727644F41133B29DFFD249FF2B7117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC2EE5AD8F952D28FBA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18CB629EEF1311BF91D2E47CDBA5A96583BA9C0B312567BB2376E601842F6C81A19E625A9149C048EEC8105B04EFE076283071BDA2D7A0BB39D8FC6C240DEA7642DBF02ECDB25306B2B78CF848AE20165D0A6AB1C7CE11FEE3D95D32202655EC45BA3038C0950A5D36B5C8C57E37DE458B0BC6067A898B09E46D1867E19FE14079C09775C1D3CA48CF3D321E7403792E342EB15956EA79C166A417C69337E82CC275ECD9A6C639B01B78DA827A17800CE74ABCC139FF3F849B731C566533BA786AA5CC5B56E945C8DA X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C7BEA09003D200E08AA5B93DA3A7DC40C3F2D889255AA95A59C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF824747F4BD2CC0FE699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D343F22CE0A71FDB37EFDA0C6C14C28F4A62CA7D677075381B6E89830FA2AC50BBCB2676605AD3475A51D7E09C32AA3244CE7122CFECBC975EC29EB1320AEFC28B2A95CA90A1D8AC56583B48618A63566E0 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojiF1u9eOpfTQ/pzGRclfXgQ== X-Mailru-Sender: B5B6A6EBBD94DAD8C47A93838048902D54E8C5C2A129CF3753F844B2DCBC193636C6DCAE6845F2A81EC9E4A2C82A33BC8C24925A86E657CE0C70AEE3C9A96FBAB3D7EE8ED63280BE112434F685709FCF0DA7A0AF5A3A8387 X-Mras: Ok Subject: [Tarantool-patches] [PATCH resend v2 08/11] lua, datetime: calculated attributes for datetimes 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 Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" * introduced a set of calculated attributes to data object, e.g.: - timestamp, seconds, microseconds, minute, or hours Part of #5941 --- src/lua/datetime.lua | 51 ++++++++++++++++++++++------------ test/app-tap/datetime.test.lua | 17 +++++++++++- 2 files changed, 50 insertions(+), 18 deletions(-) diff --git a/src/lua/datetime.lua b/src/lua/datetime.lua index 9ec06d8d8..7a208cef9 100644 --- a/src/lua/datetime.lua +++ b/src/lua/datetime.lua @@ -224,6 +224,36 @@ local function interval_serialize(self) return { secs = self.secs, nsec = self.nsec } end +local datetime_index = function(self, key) + local attributes = { + timestamp = function(self) + return tonumber(self.secs) + self.nsec / 1e9 + end, + nanoseconds = function(self) + return tonumber(self.secs * 1e9 + self.nsec) + end, + microseconds = function(self) + return tonumber(self.secs * 1e6 + self.nsec / 1e3) + end, + milliseconds = function(self) + return tonumber(self.secs * 1e3 + self.nsec / 1e6) + end, + seconds = function(self) + return tonumber(self.secs) + self.nsec / 1e9 + end, + minutes = function(self) + return (tonumber(self.secs) + self.nsec / 1e9) / 60 + end, + hours = function(self) + return (tonumber(self.secs) + self.nsec / 1e9) / (60 * 60) + end, + days = function(self) + return (tonumber(self.secs) + self.nsec / 1e9) / (60 * 60) / 24 + end, + } + return attributes[key] ~= nil and attributes[key](self) or nil +end + local datetime_mt = { -- __tostring = datetime_tostring, __serialize = datetime_serialize, @@ -232,23 +262,7 @@ local datetime_mt = { __le = datetime_le, __sub = datetime_sub, __add = datetime_add, - - nanoseconds = function(self) - return tonumber(self.secs*NANOS_PER_SEC + self.nsec) - end, - microseconds = function(self) - return tonumber(self.secs*1e6 + self.nsec*1e3) - end, - seconds = function(self) - return tonumber(self.secs + self.nsec*1e3) - end, - minutes = function(self) - return tonumber((self._ticks/(1e6*60))%60) - end, - hours = function(self) - return tonumber(self._ticks/(1e6*60*60)) - end, - + __index = datetime_index, } local interval_mt = { @@ -257,6 +271,9 @@ local interval_mt = { __eq = datetime_eq, __lt = datetime_lt, __le = datetime_le, + __sub = datetime_sub, + __add = datetime_add, + __index = datetime_index, } local function datetime_new_raw(secs, nsec, offset) diff --git a/test/app-tap/datetime.test.lua b/test/app-tap/datetime.test.lua index 09c968858..407d89556 100755 --- a/test/app-tap/datetime.test.lua +++ b/test/app-tap/datetime.test.lua @@ -4,7 +4,7 @@ local tap = require('tap') local test = tap.test("errno") local date = require('datetime') -test:plan(5) +test:plan(6) test:test("Simple tests for parser", function(test) test:plan(2) @@ -188,4 +188,19 @@ test:test("Parse iso date - invalid strings", function(test) end end) +test:test("Parse tiny date into seconds and other parts", function(test) + test:plan(9) + local str = '19700101 00:00:30.528' + local tiny = date(str) + test:ok(tiny.secs == 30, ("secs of '%s'"):format(str)) + test:ok(tiny.nsec == 528000000, ("nsec of '%s'"):format(str)) + test:ok(tiny.nanoseconds == 30528000000, "nanoseconds") + test:ok(tiny.microseconds == 30528000, "microseconds") + test:ok(tiny.milliseconds == 30528, "milliseconds") + test:ok(tiny.seconds == 30.528, "seconds") + test:ok(tiny.timestamp == 30.528, "timestamp") + test:ok(tiny.minutes == 0.5088, "minuts") + test:ok(tiny.hours == 0.00848, "hours") +end) + os.exit(test:check() and 0 or 1) -- 2.29.2