Skip to content
This repository has been archived by the owner on Dec 1, 2022. It is now read-only.

Get current time with milliseconds precision. #523

Merged
merged 11 commits into from
Jul 2, 2021
Merged

Get current time with milliseconds precision. #523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
33f79de
Get current time with milliseconds precision.
Shylock-Hg Apr 26, 2021
6d65f32
Merge branch 'master' into optimize/get-current-milliseconds
Shylock-Hg Apr 26, 2021
1edbc33
Merge branch 'master' into optimize/get-current-milliseconds
Shylock-Hg Apr 28, 2021
c87a8a5
Merge branch 'master' into optimize/get-current-milliseconds
Shylock-Hg Apr 28, 2021
c7065e1
Merge branch 'master' into optimize/get-current-milliseconds
Shylock-Hg May 10, 2021
5011efa
Merge branch 'master' into optimize/get-current-milliseconds
Shylock-Hg May 25, 2021
a91bde3
Remove the result error.
Shylock-Hg May 25, 2021
50a8a14
Merge branch 'master' into optimize/get-current-milliseconds
Shylock-Hg May 25, 2021
478bdf5
Merge branch 'master' into optimize/get-current-milliseconds
Shylock-Hg Jul 2, 2021
30df60e
Merge branch 'master' into optimize/get-current-milliseconds
Aiee Jul 2, 2021
aa64d00
Merge branch 'master' into optimize/get-current-milliseconds
yixinglu Jul 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions src/common/function/FunctionManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1524,11 +1524,7 @@ FunctionManager::FunctionManager() {
attr.body_ = [](const auto &args) -> Value {
switch (args.size()) {
case 0: {
auto result = time::TimeUtils::utcTime();
if (!result.ok()) {
return Value::kNullBadData;
}
return Value(std::move(result).value());
return Value(time::TimeUtils::utcTime());
}
case 1: {
if (args[0].get().isStr()) {
Expand Down Expand Up @@ -1562,11 +1558,7 @@ FunctionManager::FunctionManager() {
attr.body_ = [](const auto &args) -> Value {
switch (args.size()) {
case 0: {
auto result = time::TimeUtils::utcDateTime();
if (!result.ok()) {
return Value::kNullBadData;
}
return Value(std::move(result).value());
return Value(time::TimeUtils::utcDateTime());
}
case 1: {
if (args[0].get().isStr()) {
Expand Down
65 changes: 35 additions & 30 deletions src/common/time/TimeUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "common/fs/FileUtils.h"
#include "common/time/TimeConversion.h"
#include "common/time/TimezoneInfo.h"
#include "common/time/WallClock.h"

namespace nebula {
namespace time {
Expand Down Expand Up @@ -76,23 +77,19 @@ class TimeUtils {
Timezone::getGlobalTimezone().utcOffsetSecs());
}

static StatusOr<DateTime> localDateTime() {
DateTime dt;
time_t unixTime = std::time(NULL);
if (unixTime == -1) {
return Status::Error("Get unix time failed: %s.", std::strerror(errno));
}
return TimeConversion::unixSecondsToDateTime(unixTime -
Timezone::getGlobalTimezone().utcOffsetSecs());
static DateTime localDateTime() {
auto time = unixTime();
auto dt = TimeConversion::unixSecondsToDateTime(
time.seconds - Timezone::getGlobalTimezone().utcOffsetSecs());
dt.microsec = time.milliseconds * 1000;
return dt;
}

static StatusOr<DateTime> utcDateTime() {
DateTime dt;
time_t unixTime = std::time(NULL);
if (unixTime == -1) {
return Status::Error("Get unix time failed: %s.", std::strerror(errno));
}
return TimeConversion::unixSecondsToDateTime(unixTime);
static DateTime utcDateTime() {
auto time = unixTime();
auto dt = TimeConversion::unixSecondsToDateTime(time.seconds);
dt.microsec = time.milliseconds * 1000;
return dt;
}

static StatusOr<Date> dateFromMap(const Map &m);
Expand Down Expand Up @@ -159,26 +156,34 @@ class TimeUtils {
return TimeConversion::timeShift(time, Timezone::getGlobalTimezone().utcOffsetSecs());
}

static StatusOr<Time> localTime() {
Time dt;
time_t unixTime = std::time(NULL);
if (unixTime == -1) {
return Status::Error("Get unix time failed: %s.", std::strerror(errno));
}
return TimeConversion::unixSecondsToTime(unixTime -
Timezone::getGlobalTimezone().utcOffsetSecs());
static Time localTime() {
auto time = unixTime();
auto t = TimeConversion::unixSecondsToTime(time.seconds -
Timezone::getGlobalTimezone().utcOffsetSecs());
t.microsec = time.milliseconds * 1000;
return t;
}

static StatusOr<Time> utcTime() {
Time dt;
time_t unixTime = std::time(NULL);
if (unixTime == -1) {
return Status::Error("Get unix time failed: %s.", std::strerror(errno));
}
return TimeConversion::unixSecondsToTime(unixTime);
static Time utcTime() {
auto time = unixTime();
auto t = TimeConversion::unixSecondsToTime(time.seconds);
t.microsec = time.milliseconds * 1000;
return t;
}

static StatusOr<Value> toTimestamp(const Value &val);

private:
struct UnixTime {
int64_t seconds{0};
int64_t milliseconds{0};
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here is microseconds

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Milliseconds in fact.

};

// <seconds, milliseconds>
static UnixTime unixTime() {
auto ms = WallClock::fastNowInMilliSec();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can use fastNowInMicroSec directly

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The cypher only provide the milliseconds precision

return UnixTime{ms / 1000, ms % 1000};
}
}; // class TimeUtils

} // namespace time
Expand Down