From: Timur Safin via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: v.shpilevoy@tarantool.org Cc: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH resend v2 08/11] lua, datetime: calculated attributes for datetimes Date: Wed, 28 Jul 2021 13:34:10 +0300 [thread overview] Message-ID: <c6242efff4f03d1b237d83643b4654540bac3939.1627468002.git.tsafin@tarantool.org> (raw) In-Reply-To: <cover.1627468002.git.tsafin@tarantool.org> * 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
next prev parent reply other threads:[~2021-07-28 10:38 UTC|newest] Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-28 10:34 [Tarantool-patches] [PATCH resend v2 00/11] Initial datetime support Timur Safin via Tarantool-patches 2021-07-28 10:34 ` [Tarantool-patches] [PATCH resend v2 01/11] build: add Christian Hansen c-dt to the build Timur Safin via Tarantool-patches 2021-07-29 23:40 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-31 9:22 ` Timur Safin via Tarantool-patches 2021-07-28 10:34 ` [Tarantool-patches] [PATCH resend v2 02/11] lua: built-in module datetime Timur Safin via Tarantool-patches 2021-07-29 18:55 ` Oleg Babin via Tarantool-patches 2021-07-30 19:00 ` Timur Safin via Tarantool-patches 2021-07-31 6:29 ` Oleg Babin via Tarantool-patches 2021-07-31 16:51 ` Timur Safin via Tarantool-patches 2021-07-29 23:36 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-30 15:39 ` Timur Safin via Tarantool-patches 2021-08-01 17:01 ` Vladislav Shpilevoy via Tarantool-patches 2021-08-01 20:23 ` Timur Safin via Tarantool-patches 2021-08-04 23:57 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-28 10:34 ` [Tarantool-patches] [PATCH resend v2 03/11] lua, datetime: datetime tests Timur Safin via Tarantool-patches 2021-07-29 18:55 ` Oleg Babin via Tarantool-patches 2021-07-30 20:45 ` Timur Safin via Tarantool-patches 2021-07-28 10:34 ` [Tarantool-patches] [PATCH resend v2 04/11] lua, datetime: display datetime Timur Safin via Tarantool-patches 2021-07-29 18:55 ` Oleg Babin via Tarantool-patches 2021-07-30 21:48 ` Timur Safin via Tarantool-patches 2021-07-31 6:29 ` Oleg Babin via Tarantool-patches 2021-07-28 10:34 ` [Tarantool-patches] [PATCH resend v2 05/11] box, datetime: add messagepack support for datetime Timur Safin via Tarantool-patches 2021-07-28 10:34 ` [Tarantool-patches] [PATCH resend v2 06/11] box, datetime: datetime comparison for indices Timur Safin via Tarantool-patches 2021-07-29 18:56 ` Oleg Babin via Tarantool-patches 2021-07-30 22:18 ` Timur Safin via Tarantool-patches 2021-07-31 6:30 ` Oleg Babin via Tarantool-patches 2021-07-31 9:31 ` Timur Safin via Tarantool-patches 2021-07-28 10:34 ` [Tarantool-patches] [PATCH resend v2 07/11] lua, datetime: proper datetime encoding Timur Safin via Tarantool-patches 2021-07-29 18:57 ` Oleg Babin via Tarantool-patches 2021-07-30 22:20 ` Timur Safin via Tarantool-patches 2021-07-28 10:34 ` Timur Safin via Tarantool-patches [this message] 2021-07-29 18:57 ` [Tarantool-patches] [PATCH resend v2 08/11] lua, datetime: calculated attributes for datetimes Oleg Babin via Tarantool-patches 2021-07-30 22:30 ` Timur Safin via Tarantool-patches 2021-07-31 6:31 ` Oleg Babin via Tarantool-patches 2021-07-28 10:34 ` [Tarantool-patches] [PATCH resend v2 09/11] lua, datetime: time intervals support Timur Safin via Tarantool-patches 2021-07-29 18:58 ` Oleg Babin via Tarantool-patches 2021-07-30 22:58 ` Timur Safin via Tarantool-patches 2021-07-31 6:31 ` Oleg Babin via Tarantool-patches 2021-07-31 9:20 ` Timur Safin via Tarantool-patches 2021-07-28 10:34 ` [Tarantool-patches] [PATCH resend v2 10/11] lua, datetime: unixtime, timestamp setters in datetime.lua Timur Safin via Tarantool-patches 2021-07-29 18:58 ` Oleg Babin via Tarantool-patches 2021-07-30 23:11 ` Timur Safin via Tarantool-patches 2021-07-31 6:31 ` Oleg Babin via Tarantool-patches 2021-07-31 9:54 ` Timur Safin via Tarantool-patches 2021-07-28 10:34 ` [Tarantool-patches] [PATCH resend v2 11/11] datetime: changelog for datetime module Timur Safin via Tarantool-patches 2021-07-29 18:55 ` [Tarantool-patches] [PATCH resend v2 00/11] Initial datetime support Oleg Babin via Tarantool-patches
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=c6242efff4f03d1b237d83643b4654540bac3939.1627468002.git.tsafin@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=tsafin@tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH resend v2 08/11] lua, datetime: calculated attributes for datetimes' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox