GH-43095: [C++] Update bundled vendor/datetime to support for building with libc++ and C++20#43094

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kou merged 2 commits into from
Jul 12, 2024
Merged

GH-43095: [C++] Update bundled vendor/datetime to support for building with libc++ and C++20 #43094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfe0792
update vendored/datetime
Jul 11, 2024
6391021
applying arrow specific patches
Jul 11, 2024
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
2 changes: 1 addition & 1 deletion cpp/src/arrow/vendored/datetime/README.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ copies or substantial portions of the Software.
Sources for datetime are adapted from Howard Hinnant's date library
(https://github.com/HowardHinnant/date).

Sources are taken from changeset cc4685a21e4a4fdae707ad1233c61bbaff241f93
Sources are taken from changeset 1ead6715dec030d340a316c927c877a3c4e5a00c
of the above project.

The following changes are made:
Expand Down
27 changes: 19 additions & 8 deletions cpp/src/arrow/vendored/datetime/date.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4230,7 +4230,7 @@ inline
std::basic_ostream<CharT, Traits>&
operator<<(std::basic_ostream<CharT, Traits>& os, const local_time<Duration>& ut)
{
return (os << sys_time<Duration>{ut.time_since_epoch()});
return (date::operator<<(os, sys_time<Duration>{ut.time_since_epoch()}));
}

namespace detail
Expand DownExpand Up@@ -6353,7 +6353,10 @@ read_signed(std::basic_istream<CharT, Traits>& is, unsigned m = 1, unsigned M =
if (('0' <= c && c <= '9') || c == '-' || c == '+')
{
if (c == '-' || c == '+')
{
(void)is.get();
--M;
}
auto x = static_cast<int>(read_unsigned(is, std::max(m, 1u), M));
if (!is.fail())
{
Expand DownExpand Up@@ -6526,7 +6529,14 @@ read(std::basic_istream<CharT, Traits>& is, int a0, Args&& ...args)
*e++ = static_cast<CharT>(CharT(u % 10) + CharT{'0'});
u /= 10;
} while (u > 0);
#if defined(__GNUC__) && __GNUC__ >= 11
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wstringop-overflow"
#endif
std::reverse(buf, e);
#if defined(__GNUC__) && __GNUC__ >= 11
#pragma GCC diagnostic pop
#endif
for (auto p = buf; p != e && is.rdstate() == std::ios::goodbit; ++p)
read(is, *p);
}
Expand DownExpand Up@@ -6592,7 +6602,7 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,

CONSTDATA int not_a_year = numeric_limits<short>::min();
CONSTDATA int not_a_2digit_year = 100;
CONSTDATA int not_a_century = not_a_year / 100;
CONSTDATA int not_a_century = numeric_limits<int>::min();
CONSTDATA int not_a_month = 0;
CONSTDATA int not_a_day = 0;
CONSTDATA int not_a_hour = numeric_limits<int>::min();
Expand DownExpand Up@@ -7519,7 +7529,12 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
{
auto c = static_cast<char>(Traits::to_char_type(ic));
if (c == '-')
{
neg = true;
(void)is.get();
}
else if (c == '+')
(void)is.get();
}
if (modified == CharT{})
{
Expand DownExpand Up@@ -7735,9 +7750,7 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
year_month_day ymd_trial = sys_days(year{Y}/January/Sunday[1]) +
weeks{U-1} +
(weekday{static_cast<unsigned>(wd)} - Sunday);
if (Y == not_a_year)
Y = static_cast<int>(ymd_trial.year());
else if (year{Y} != ymd_trial.year())
if (year{Y} != ymd_trial.year())
goto broken;
if (m == not_a_month)
m = static_cast<int>(static_cast<unsigned>(ymd_trial.month()));
Expand All@@ -7754,9 +7767,7 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
year_month_day ymd_trial = sys_days(year{Y}/January/Monday[1]) +
weeks{W-1} +
(weekday{static_cast<unsigned>(wd)} - Monday);
if (Y == not_a_year)
Y = static_cast<int>(ymd_trial.year());
else if (year{Y} != ymd_trial.year())
if (year{Y} != ymd_trial.year())
goto broken;
if (m == not_a_month)
m = static_cast<int>(static_cast<unsigned>(ymd_trial.month()));
Expand Down
95 changes: 85 additions & 10 deletions cpp/src/arrow/vendored/datetime/tz.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,10 @@
# define TARGET_OS_SIMULATOR 0
#endif

#if defined(ANDROID) || defined(__ANDROID__)
#include <sys/system_properties.h>
#endif

#if USE_OS_TZDB
# include <dirent.h>
#endif
Expand DownExpand Up@@ -2709,7 +2713,8 @@ operator<<(std::ostream& os, const time_zone& z)
os.width(8);
os << s.format_ << " ";
os << s.until_year_ << ' ' << s.until_date_;
os << " " << s.until_utc_ << " UTC";
os << " ";
date::operator<<(os, s.until_utc_) << " UTC";
os << " " << s.until_std_ << " STD";
os << " " << s.until_loc_;
os << " " << make_time(s.initial_save_);
Expand All@@ -2734,8 +2739,7 @@ operator<<(std::ostream& os, const time_zone& z)
std::ostream&
operator<<(std::ostream& os, const leap_second& x)
{
using namespace date;
return os << x.date_ << " +";
return date::operator<<(os, x.date_) << " +";
}

#if USE_OS_TZDB
Expand DownExpand Up@@ -3716,13 +3720,78 @@ get_tzdb()
return get_tzdb_list().front();
}

namespace {

class recursion_limiter
{
unsigned depth_ = 0;
unsigned limit_;

class restore_recursion_depth;

public:
recursion_limiter(recursion_limiter const&) = delete;
recursion_limiter& operator=(recursion_limiter const&) = delete;

explicit constexpr recursion_limiter(unsigned limit) noexcept;

restore_recursion_depth count();
};

class recursion_limiter::restore_recursion_depth
{
recursion_limiter* rc_;

public:
~restore_recursion_depth();
restore_recursion_depth(restore_recursion_depth&&) = default;

explicit restore_recursion_depth(recursion_limiter* rc) noexcept;
};

inline
recursion_limiter::restore_recursion_depth::~restore_recursion_depth()
{
--(rc_->depth_);
}

inline
recursion_limiter::restore_recursion_depth::restore_recursion_depth(recursion_limiter* rc)
noexcept
: rc_{rc}
{}

inline
constexpr
recursion_limiter::recursion_limiter(unsigned limit) noexcept
: limit_{limit}
{
}

inline
recursion_limiter::restore_recursion_depth
recursion_limiter::count()
{
++depth_;
if (depth_ > limit_)
throw std::runtime_error("recursion limit of " +
std::to_string(limit_) + " exceeded");
return restore_recursion_depth{this};
}

} // unnamed namespace

const time_zone*
#if HAS_STRING_VIEW
tzdb::locate_zone(std::string_view tz_name) const
#else
tzdb::locate_zone(const std::string& tz_name) const
#endif
{
// If a link-to-link chain exceeds this limit, give up
thread_local recursion_limiter rc{10};
auto restore_count = rc.count();

auto zi = std::lower_bound(zones.begin(), zones.end(), tz_name,
#if HAS_STRING_VIEW
[](const time_zone& z, const std::string_view& nm)
Expand All@@ -3746,13 +3815,7 @@ tzdb::locate_zone(const std::string& tz_name) const
});
if (li != links.end() && li->name() == tz_name)
{
zi = std::lower_bound(zones.begin(), zones.end(), li->target(),
[](const time_zone& z, const std::string& nm)
{
return z.name() < nm;
});
if (zi != zones.end() && zi->name() == li->target())
return &*zi;
return locate_zone(li->target());
}
#endif // !USE_OS_TZDB
throw std::runtime_error(std::string(tz_name) + " not found in timezone database");
Expand DownExpand Up@@ -4038,6 +4101,18 @@ tzdb::current_zone() const
if (!result.empty())
return locate_zone(result);
#endif
// Fall through to try other means.
}
{
// On Android, it is not possible to use file based approach either,
// we have to ask the value of `persist.sys.timezone` system property
#if defined(ANDROID) || defined(__ANDROID__)
char sys_timezone[PROP_VALUE_MAX];
if (__system_property_get("persist.sys.timezone", sys_timezone) > 0)
{
return locate_zone(sys_timezone);
}
#endif // defined(ANDROID) || defined(__ANDROID__)
// Fall through to try other means.
}
{
Expand Down
4 changes: 2 additions & 2 deletions cpp/src/arrow/vendored/datetime/tz.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -239,8 +239,8 @@ nonexistent_local_time::make_msg(local_time<Duration> tp, const local_info& i)
<< i.first.abbrev << " and\n"
<< local_seconds{i.second.begin.time_since_epoch()} + i.second.offset << ' '
<< i.second.abbrev
<< " which are both equivalent to\n"
<< i.first.end << " UTC";
<< " which are both equivalent to\n";
date::operator<<(os, i.first.end) << " UTC";
return os.str();
}

Expand Down
3 changes: 1 addition & 2 deletions cpp/src/arrow/vendored/datetime/tz_private.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -291,8 +291,7 @@ struct transition
std::ostream&
operator<<(std::ostream& os, const transition& t)
{
using date::operator<<;
os << t.timepoint << "Z ";
date::operator<<(os, t.timepoint) << "Z ";
if (t.info->offset >= std::chrono::seconds{0})
os << '+';
os << make_time(t.info->offset);
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
GH-43095: [C++] Update bundled vendor/datetime to support for building with libc++ and C++20#43094

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

kou
merged 2 commits into

from

Jul 12, 2024
 Merged


GH-43095: [C++] Update bundled vendor/datetime to support for building with libc++ and C++20
#43094
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
bfe0792

update vendored/datetime

Jul 11, 2024
6391021

applying arrow specific patches

Jul 11, 2024

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


2 changes: 1 addition & 1 deletion
cpp/src/arrow/vendored/datetime/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ copies or substantial portions of the Software.
Sources for datetime are adapted from Howard Hinnant's date library
(https://github.com/HowardHinnant/date).

Sources are taken from changeset cc4685a21e4a4fdae707ad1233c61bbaff241f93
Sources are taken from changeset 1ead6715dec030d340a316c927c877a3c4e5a00c
of the above project.

The following changes are made:
Expand Down

27 changes: 19 additions & 8 deletions
cpp/src/arrow/vendored/datetime/date.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4230,7 +4230,7 @@ inline
std::basic_ostream<CharT, Traits>&
operator<<(std::basic_ostream<CharT, Traits>& os, const local_time<Duration>& ut)
{
 return (os << sys_time<Duration>{ut.time_since_epoch()});
 return (date::operator<<(os, sys_time<Duration>{ut.time_since_epoch()}));
}

namespace detail
Expand DownExpand Up@@ -6353,7 +6353,10 @@ read_signed(std::basic_istream<CharT, Traits>& is, unsigned m = 1, unsigned M =
 if (('0' <= c && c <= '9') || c == '-' || c == '+')
 {
 if (c == '-' || c == '+')
 {
 (void)is.get();
 --M;
 }
 auto x = static_cast<int>(read_unsigned(is, std::max(m, 1u), M));
 if (!is.fail())
 {
Expand DownExpand Up@@ -6526,7 +6529,14 @@ read(std::basic_istream<CharT, Traits>& is, int a0, Args&& ...args)
 *e++ = static_cast<CharT>(CharT(u % 10) + CharT{'0'});
 u /= 10;
 } while (u > 0);
#if defined(__GNUC__) && __GNUC__ >= 11
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wstringop-overflow"
#endif
 std::reverse(buf, e);
#if defined(__GNUC__) && __GNUC__ >= 11
#pragma GCC diagnostic pop
#endif
 for (auto p = buf; p != e && is.rdstate() == std::ios::goodbit; ++p)
 read(is, *p);
 }
Expand DownExpand Up@@ -6592,7 +6602,7 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,

 CONSTDATA int not_a_year = numeric_limits<short>::min();
 CONSTDATA int not_a_2digit_year = 100;
 CONSTDATA int not_a_century = not_a_year / 100;
 CONSTDATA int not_a_century = numeric_limits<int>::min();
 CONSTDATA int not_a_month = 0;
 CONSTDATA int not_a_day = 0;
 CONSTDATA int not_a_hour = numeric_limits<int>::min();
Expand DownExpand Up@@ -7519,7 +7529,12 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
 {
 auto c = static_cast<char>(Traits::to_char_type(ic));
 if (c == '-')
 {
 neg = true;
 (void)is.get();
 }
 else if (c == '+')
 (void)is.get();
 }
 if (modified == CharT{})
 {
Expand DownExpand Up@@ -7735,9 +7750,7 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
 year_month_day ymd_trial = sys_days(year{Y}/January/Sunday[1]) +
 weeks{U-1} +
 (weekday{static_cast<unsigned>(wd)} - Sunday);
 if (Y == not_a_year)
 Y = static_cast<int>(ymd_trial.year());
 else if (year{Y} != ymd_trial.year())
 if (year{Y} != ymd_trial.year())
 goto broken;
 if (m == not_a_month)
 m = static_cast<int>(static_cast<unsigned>(ymd_trial.month()));
Expand All@@ -7754,9 +7767,7 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
 year_month_day ymd_trial = sys_days(year{Y}/January/Monday[1]) +
 weeks{W-1} +
 (weekday{static_cast<unsigned>(wd)} - Monday);
 if (Y == not_a_year)
 Y = static_cast<int>(ymd_trial.year());
 else if (year{Y} != ymd_trial.year())
 if (year{Y} != ymd_trial.year())
 goto broken;
 if (m == not_a_month)
 m = static_cast<int>(static_cast<unsigned>(ymd_trial.month()));
Expand Down

95 changes: 85 additions & 10 deletions
cpp/src/arrow/vendored/datetime/tz.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,10 @@
# define TARGET_OS_SIMULATOR 0
#endif

#if defined(ANDROID) || defined(__ANDROID__)
#include <sys/system_properties.h>
#endif

#if USE_OS_TZDB
# include <dirent.h>
#endif
Expand DownExpand Up@@ -2709,7 +2713,8 @@ operator<<(std::ostream& os, const time_zone& z)
 os.width(8);
 os << s.format_ << " ";
 os << s.until_year_ << ' ' << s.until_date_;
 os << " " << s.until_utc_ << " UTC";
 os << " ";
 date::operator<<(os, s.until_utc_) << " UTC";
 os << " " << s.until_std_ << " STD";
 os << " " << s.until_loc_;
 os << " " << make_time(s.initial_save_);
Expand All@@ -2734,8 +2739,7 @@ operator<<(std::ostream& os, const time_zone& z)
std::ostream&
operator<<(std::ostream& os, const leap_second& x)
{
 using namespace date;
 return os << x.date_ << " +";
 return date::operator<<(os, x.date_) << " +";
}

#if USE_OS_TZDB
Expand DownExpand Up@@ -3716,13 +3720,78 @@ get_tzdb()
 return get_tzdb_list().front();
}

namespace {

class recursion_limiter
{
 unsigned depth_ = 0;
 unsigned limit_;

 class restore_recursion_depth;

public:
 recursion_limiter(recursion_limiter const&) = delete;
 recursion_limiter& operator=(recursion_limiter const&) = delete;

 explicit constexpr recursion_limiter(unsigned limit) noexcept;

 restore_recursion_depth count();
};

class recursion_limiter::restore_recursion_depth
{
 recursion_limiter* rc_;

public:
 ~restore_recursion_depth();
 restore_recursion_depth(restore_recursion_depth&&) = default;

 explicit restore_recursion_depth(recursion_limiter* rc) noexcept;
};

inline
recursion_limiter::restore_recursion_depth::~restore_recursion_depth()
{
 --(rc_->depth_);
}

inline
recursion_limiter::restore_recursion_depth::restore_recursion_depth(recursion_limiter* rc)
 noexcept
 : rc_{rc}
{}

inline
constexpr
recursion_limiter::recursion_limiter(unsigned limit) noexcept
 : limit_{limit}
{
}

inline
recursion_limiter::restore_recursion_depth
recursion_limiter::count()
{
 ++depth_;
 if (depth_ > limit_)
 throw std::runtime_error("recursion limit of " +
 std::to_string(limit_) + " exceeded");
 return restore_recursion_depth{this};
}

} // unnamed namespace

const time_zone*
#if HAS_STRING_VIEW
tzdb::locate_zone(std::string_view tz_name) const
#else
tzdb::locate_zone(const std::string& tz_name) const
#endif
{
 // If a link-to-link chain exceeds this limit, give up
 thread_local recursion_limiter rc{10};
 auto restore_count = rc.count();

 auto zi = std::lower_bound(zones.begin(), zones.end(), tz_name,
#if HAS_STRING_VIEW
 [](const time_zone& z, const std::string_view& nm)
Expand All@@ -3746,13 +3815,7 @@ tzdb::locate_zone(const std::string& tz_name) const
 });
 if (li != links.end() && li->name() == tz_name)
 {
 zi = std::lower_bound(zones.begin(), zones.end(), li->target(),
 [](const time_zone& z, const std::string& nm)
 {
 return z.name() < nm;
 });
 if (zi != zones.end() && zi->name() == li->target())
 return &*zi;
 return locate_zone(li->target());
 }
#endif // !USE_OS_TZDB
 throw std::runtime_error(std::string(tz_name) + " not found in timezone database");
Expand DownExpand Up@@ -4038,6 +4101,18 @@ tzdb::current_zone() const
 if (!result.empty())
 return locate_zone(result);
#endif
 // Fall through to try other means.
 }
 {
 // On Android, it is not possible to use file based approach either,
 // we have to ask the value of `persist.sys.timezone` system property
#if defined(ANDROID) || defined(__ANDROID__)
 char sys_timezone[PROP_VALUE_MAX];
 if (__system_property_get("persist.sys.timezone", sys_timezone) > 0)
 {
 return locate_zone(sys_timezone);
 }
#endif // defined(ANDROID) || defined(__ANDROID__)
 // Fall through to try other means.
 }
 {
Expand Down

4 changes: 2 additions & 2 deletions
cpp/src/arrow/vendored/datetime/tz.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,8 +239,8 @@ nonexistent_local_time::make_msg(local_time<Duration> tp, const local_info& i)
 << i.first.abbrev << " and\n"
 << local_seconds{i.second.begin.time_since_epoch()} + i.second.offset << ' '
 << i.second.abbrev
 << " which are both equivalent to\n"
 << i.first.end << " UTC";
 << " which are both equivalent to\n";
date::operator<<(os, i.first.end) << " UTC";
 return os.str();
}

Expand Down

3 changes: 1 addition & 2 deletions
cpp/src/arrow/vendored/datetime/tz_private.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,8 +291,7 @@ struct transition
 std::ostream&
 operator<<(std::ostream& os, const transition& t)
 {
 using date::operator<<;
 os << t.timepoint << "Z ";
 date::operator<<(os, t.timepoint) << "Z ";
 if (t.info->offset >= std::chrono::seconds{0})
 os << '+';
 os << make_time(t.info->offset);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
GH-43095: [C++] Update bundled vendor/datetime to support for building with libc++ and C++20#43094

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

kou
merged 2 commits into

from

Jul 12, 2024
 Merged


GH-43095: [C++] Update bundled vendor/datetime to support for building with libc++ and C++20
#43094
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
bfe0792

update vendored/datetime

Jul 11, 2024
6391021

applying arrow specific patches

Jul 11, 2024

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


2 changes: 1 addition & 1 deletion
cpp/src/arrow/vendored/datetime/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ copies or substantial portions of the Software.
Sources for datetime are adapted from Howard Hinnant's date library
(https://github.com/HowardHinnant/date).

Sources are taken from changeset cc4685a21e4a4fdae707ad1233c61bbaff241f93
Sources are taken from changeset 1ead6715dec030d340a316c927c877a3c4e5a00c
of the above project.

The following changes are made:
Expand Down

27 changes: 19 additions & 8 deletions
cpp/src/arrow/vendored/datetime/date.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4230,7 +4230,7 @@ inline
std::basic_ostream<CharT, Traits>&
operator<<(std::basic_ostream<CharT, Traits>& os, const local_time<Duration>& ut)
{
 return (os << sys_time<Duration>{ut.time_since_epoch()});
 return (date::operator<<(os, sys_time<Duration>{ut.time_since_epoch()}));
}

namespace detail
Expand DownExpand Up@@ -6353,7 +6353,10 @@ read_signed(std::basic_istream<CharT, Traits>& is, unsigned m = 1, unsigned M =
 if (('0' <= c && c <= '9') || c == '-' || c == '+')
 {
 if (c == '-' || c == '+')
 {
 (void)is.get();
 --M;
 }
 auto x = static_cast<int>(read_unsigned(is, std::max(m, 1u), M));
 if (!is.fail())
 {
Expand DownExpand Up@@ -6526,7 +6529,14 @@ read(std::basic_istream<CharT, Traits>& is, int a0, Args&& ...args)
 *e++ = static_cast<CharT>(CharT(u % 10) + CharT{'0'});
 u /= 10;
 } while (u > 0);
#if defined(__GNUC__) && __GNUC__ >= 11
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wstringop-overflow"
#endif
 std::reverse(buf, e);
#if defined(__GNUC__) && __GNUC__ >= 11
#pragma GCC diagnostic pop
#endif
 for (auto p = buf; p != e && is.rdstate() == std::ios::goodbit; ++p)
 read(is, *p);
 }
Expand DownExpand Up@@ -6592,7 +6602,7 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,

 CONSTDATA int not_a_year = numeric_limits<short>::min();
 CONSTDATA int not_a_2digit_year = 100;
 CONSTDATA int not_a_century = not_a_year / 100;
 CONSTDATA int not_a_century = numeric_limits<int>::min();
 CONSTDATA int not_a_month = 0;
 CONSTDATA int not_a_day = 0;
 CONSTDATA int not_a_hour = numeric_limits<int>::min();
Expand DownExpand Up@@ -7519,7 +7529,12 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
 {
 auto c = static_cast<char>(Traits::to_char_type(ic));
 if (c == '-')
 {
 neg = true;
 (void)is.get();
 }
 else if (c == '+')
 (void)is.get();
 }
 if (modified == CharT{})
 {
Expand DownExpand Up@@ -7735,9 +7750,7 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
 year_month_day ymd_trial = sys_days(year{Y}/January/Sunday[1]) +
 weeks{U-1} +
 (weekday{static_cast<unsigned>(wd)} - Sunday);
 if (Y == not_a_year)
 Y = static_cast<int>(ymd_trial.year());
 else if (year{Y} != ymd_trial.year())
 if (year{Y} != ymd_trial.year())
 goto broken;
 if (m == not_a_month)
 m = static_cast<int>(static_cast<unsigned>(ymd_trial.month()));
Expand All@@ -7754,9 +7767,7 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
 year_month_day ymd_trial = sys_days(year{Y}/January/Monday[1]) +
 weeks{W-1} +
 (weekday{static_cast<unsigned>(wd)} - Monday);
 if (Y == not_a_year)
 Y = static_cast<int>(ymd_trial.year());
 else if (year{Y} != ymd_trial.year())
 if (year{Y} != ymd_trial.year())
 goto broken;
 if (m == not_a_month)
 m = static_cast<int>(static_cast<unsigned>(ymd_trial.month()));
Expand Down

95 changes: 85 additions & 10 deletions
cpp/src/arrow/vendored/datetime/tz.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,10 @@
# define TARGET_OS_SIMULATOR 0
#endif

#if defined(ANDROID) || defined(__ANDROID__)
#include <sys/system_properties.h>
#endif

#if USE_OS_TZDB
# include <dirent.h>
#endif
Expand DownExpand Up@@ -2709,7 +2713,8 @@ operator<<(std::ostream& os, const time_zone& z)
 os.width(8);
 os << s.format_ << " ";
 os << s.until_year_ << ' ' << s.until_date_;
 os << " " << s.until_utc_ << " UTC";
 os << " ";
 date::operator<<(os, s.until_utc_) << " UTC";
 os << " " << s.until_std_ << " STD";
 os << " " << s.until_loc_;
 os << " " << make_time(s.initial_save_);
Expand All@@ -2734,8 +2739,7 @@ operator<<(std::ostream& os, const time_zone& z)
std::ostream&
operator<<(std::ostream& os, const leap_second& x)
{
 using namespace date;
 return os << x.date_ << " +";
 return date::operator<<(os, x.date_) << " +";
}

#if USE_OS_TZDB
Expand DownExpand Up@@ -3716,13 +3720,78 @@ get_tzdb()
 return get_tzdb_list().front();
}

namespace {

class recursion_limiter
{
 unsigned depth_ = 0;
 unsigned limit_;

 class restore_recursion_depth;

public:
 recursion_limiter(recursion_limiter const&) = delete;
 recursion_limiter& operator=(recursion_limiter const&) = delete;

 explicit constexpr recursion_limiter(unsigned limit) noexcept;

 restore_recursion_depth count();
};

class recursion_limiter::restore_recursion_depth
{
 recursion_limiter* rc_;

public:
 ~restore_recursion_depth();
 restore_recursion_depth(restore_recursion_depth&&) = default;

 explicit restore_recursion_depth(recursion_limiter* rc) noexcept;
};

inline
recursion_limiter::restore_recursion_depth::~restore_recursion_depth()
{
 --(rc_->depth_);
}

inline
recursion_limiter::restore_recursion_depth::restore_recursion_depth(recursion_limiter* rc)
 noexcept
 : rc_{rc}
{}

inline
constexpr
recursion_limiter::recursion_limiter(unsigned limit) noexcept
 : limit_{limit}
{
}

inline
recursion_limiter::restore_recursion_depth
recursion_limiter::count()
{
 ++depth_;
 if (depth_ > limit_)
 throw std::runtime_error("recursion limit of " +
 std::to_string(limit_) + " exceeded");
 return restore_recursion_depth{this};
}

} // unnamed namespace

const time_zone*
#if HAS_STRING_VIEW
tzdb::locate_zone(std::string_view tz_name) const
#else
tzdb::locate_zone(const std::string& tz_name) const
#endif
{
 // If a link-to-link chain exceeds this limit, give up
 thread_local recursion_limiter rc{10};
 auto restore_count = rc.count();

 auto zi = std::lower_bound(zones.begin(), zones.end(), tz_name,
#if HAS_STRING_VIEW
 [](const time_zone& z, const std::string_view& nm)
Expand All@@ -3746,13 +3815,7 @@ tzdb::locate_zone(const std::string& tz_name) const
 });
 if (li != links.end() && li->name() == tz_name)
 {
 zi = std::lower_bound(zones.begin(), zones.end(), li->target(),
 [](const time_zone& z, const std::string& nm)
 {
 return z.name() < nm;
 });
 if (zi != zones.end() && zi->name() == li->target())
 return &*zi;
 return locate_zone(li->target());
 }
#endif // !USE_OS_TZDB
 throw std::runtime_error(std::string(tz_name) + " not found in timezone database");
Expand DownExpand Up@@ -4038,6 +4101,18 @@ tzdb::current_zone() const
 if (!result.empty())
 return locate_zone(result);
#endif
 // Fall through to try other means.
 }
 {
 // On Android, it is not possible to use file based approach either,
 // we have to ask the value of `persist.sys.timezone` system property
#if defined(ANDROID) || defined(__ANDROID__)
 char sys_timezone[PROP_VALUE_MAX];
 if (__system_property_get("persist.sys.timezone", sys_timezone) > 0)
 {
 return locate_zone(sys_timezone);
 }
#endif // defined(ANDROID) || defined(__ANDROID__)
 // Fall through to try other means.
 }
 {
Expand Down

4 changes: 2 additions & 2 deletions
cpp/src/arrow/vendored/datetime/tz.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,8 +239,8 @@ nonexistent_local_time::make_msg(local_time<Duration> tp, const local_info& i)
 << i.first.abbrev << " and\n"
 << local_seconds{i.second.begin.time_since_epoch()} + i.second.offset << ' '
 << i.second.abbrev
 << " which are both equivalent to\n"
 << i.first.end << " UTC";
 << " which are both equivalent to\n";
date::operator<<(os, i.first.end) << " UTC";
 return os.str();
}

Expand Down

3 changes: 1 addition & 2 deletions
cpp/src/arrow/vendored/datetime/tz_private.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,8 +291,7 @@ struct transition
 std::ostream&
 operator<<(std::ostream& os, const transition& t)
 {
 using date::operator<<;
 os << t.timepoint << "Z ";
 date::operator<<(os, t.timepoint) << "Z ";
 if (t.info->offset >= std::chrono::seconds{0})
 os << '+';
 os << make_time(t.info->offset);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
GH-43095: [C++] Update bundled vendor/datetime to support for building with libc++ and C++20#43094

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

kou
merged 2 commits into

from

Jul 12, 2024
 Merged


GH-43095: [C++] Update bundled vendor/datetime to support for building with libc++ and C++20
#43094
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
bfe0792

update vendored/datetime

Jul 11, 2024
6391021

applying arrow specific patches

Jul 11, 2024

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


2 changes: 1 addition & 1 deletion
cpp/src/arrow/vendored/datetime/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ copies or substantial portions of the Software.
Sources for datetime are adapted from Howard Hinnant's date library
(https://github.com/HowardHinnant/date).

Sources are taken from changeset cc4685a21e4a4fdae707ad1233c61bbaff241f93
Sources are taken from changeset 1ead6715dec030d340a316c927c877a3c4e5a00c
of the above project.

The following changes are made:
Expand Down

27 changes: 19 additions & 8 deletions
cpp/src/arrow/vendored/datetime/date.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4230,7 +4230,7 @@ inline
std::basic_ostream<CharT, Traits>&
operator<<(std::basic_ostream<CharT, Traits>& os, const local_time<Duration>& ut)
{
 return (os << sys_time<Duration>{ut.time_since_epoch()});
 return (date::operator<<(os, sys_time<Duration>{ut.time_since_epoch()}));
}

namespace detail
Expand DownExpand Up@@ -6353,7 +6353,10 @@ read_signed(std::basic_istream<CharT, Traits>& is, unsigned m = 1, unsigned M =
 if (('0' <= c && c <= '9') || c == '-' || c == '+')
 {
 if (c == '-' || c == '+')
 {
 (void)is.get();
 --M;
 }
 auto x = static_cast<int>(read_unsigned(is, std::max(m, 1u), M));
 if (!is.fail())
 {
Expand DownExpand Up@@ -6526,7 +6529,14 @@ read(std::basic_istream<CharT, Traits>& is, int a0, Args&& ...args)
 *e++ = static_cast<CharT>(CharT(u % 10) + CharT{'0'});
 u /= 10;
 } while (u > 0);
#if defined(__GNUC__) && __GNUC__ >= 11
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wstringop-overflow"
#endif
 std::reverse(buf, e);
#if defined(__GNUC__) && __GNUC__ >= 11
#pragma GCC diagnostic pop
#endif
 for (auto p = buf; p != e && is.rdstate() == std::ios::goodbit; ++p)
 read(is, *p);
 }
Expand DownExpand Up@@ -6592,7 +6602,7 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,

 CONSTDATA int not_a_year = numeric_limits<short>::min();
 CONSTDATA int not_a_2digit_year = 100;
 CONSTDATA int not_a_century = not_a_year / 100;
 CONSTDATA int not_a_century = numeric_limits<int>::min();
 CONSTDATA int not_a_month = 0;
 CONSTDATA int not_a_day = 0;
 CONSTDATA int not_a_hour = numeric_limits<int>::min();
Expand DownExpand Up@@ -7519,7 +7529,12 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
 {
 auto c = static_cast<char>(Traits::to_char_type(ic));
 if (c == '-')
 {
 neg = true;
 (void)is.get();
 }
 else if (c == '+')
 (void)is.get();
 }
 if (modified == CharT{})
 {
Expand DownExpand Up@@ -7735,9 +7750,7 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
 year_month_day ymd_trial = sys_days(year{Y}/January/Sunday[1]) +
 weeks{U-1} +
 (weekday{static_cast<unsigned>(wd)} - Sunday);
 if (Y == not_a_year)
 Y = static_cast<int>(ymd_trial.year());
 else if (year{Y} != ymd_trial.year())
 if (year{Y} != ymd_trial.year())
 goto broken;
 if (m == not_a_month)
 m = static_cast<int>(static_cast<unsigned>(ymd_trial.month()));
Expand All@@ -7754,9 +7767,7 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
 year_month_day ymd_trial = sys_days(year{Y}/January/Monday[1]) +
 weeks{W-1} +
 (weekday{static_cast<unsigned>(wd)} - Monday);
 if (Y == not_a_year)
 Y = static_cast<int>(ymd_trial.year());
 else if (year{Y} != ymd_trial.year())
 if (year{Y} != ymd_trial.year())
 goto broken;
 if (m == not_a_month)
 m = static_cast<int>(static_cast<unsigned>(ymd_trial.month()));
Expand Down

95 changes: 85 additions & 10 deletions
cpp/src/arrow/vendored/datetime/tz.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,10 @@
# define TARGET_OS_SIMULATOR 0
#endif

#if defined(ANDROID) || defined(__ANDROID__)
#include <sys/system_properties.h>
#endif

#if USE_OS_TZDB
# include <dirent.h>
#endif
Expand DownExpand Up@@ -2709,7 +2713,8 @@ operator<<(std::ostream& os, const time_zone& z)
 os.width(8);
 os << s.format_ << " ";
 os << s.until_year_ << ' ' << s.until_date_;
 os << " " << s.until_utc_ << " UTC";
 os << " ";
 date::operator<<(os, s.until_utc_) << " UTC";
 os << " " << s.until_std_ << " STD";
 os << " " << s.until_loc_;
 os << " " << make_time(s.initial_save_);
Expand All@@ -2734,8 +2739,7 @@ operator<<(std::ostream& os, const time_zone& z)
std::ostream&
operator<<(std::ostream& os, const leap_second& x)
{
 using namespace date;
 return os << x.date_ << " +";
 return date::operator<<(os, x.date_) << " +";
}

#if USE_OS_TZDB
Expand DownExpand Up@@ -3716,13 +3720,78 @@ get_tzdb()
 return get_tzdb_list().front();
}

namespace {

class recursion_limiter
{
 unsigned depth_ = 0;
 unsigned limit_;

 class restore_recursion_depth;

public:
 recursion_limiter(recursion_limiter const&) = delete;
 recursion_limiter& operator=(recursion_limiter const&) = delete;

 explicit constexpr recursion_limiter(unsigned limit) noexcept;

 restore_recursion_depth count();
};

class recursion_limiter::restore_recursion_depth
{
 recursion_limiter* rc_;

public:
 ~restore_recursion_depth();
 restore_recursion_depth(restore_recursion_depth&&) = default;

 explicit restore_recursion_depth(recursion_limiter* rc) noexcept;
};

inline
recursion_limiter::restore_recursion_depth::~restore_recursion_depth()
{
 --(rc_->depth_);
}

inline
recursion_limiter::restore_recursion_depth::restore_recursion_depth(recursion_limiter* rc)
 noexcept
 : rc_{rc}
{}

inline
constexpr
recursion_limiter::recursion_limiter(unsigned limit) noexcept
 : limit_{limit}
{
}

inline
recursion_limiter::restore_recursion_depth
recursion_limiter::count()
{
 ++depth_;
 if (depth_ > limit_)
 throw std::runtime_error("recursion limit of " +
 std::to_string(limit_) + " exceeded");
 return restore_recursion_depth{this};
}

} // unnamed namespace

const time_zone*
#if HAS_STRING_VIEW
tzdb::locate_zone(std::string_view tz_name) const
#else
tzdb::locate_zone(const std::string& tz_name) const
#endif
{
 // If a link-to-link chain exceeds this limit, give up
 thread_local recursion_limiter rc{10};
 auto restore_count = rc.count();

 auto zi = std::lower_bound(zones.begin(), zones.end(), tz_name,
#if HAS_STRING_VIEW
 [](const time_zone& z, const std::string_view& nm)
Expand All@@ -3746,13 +3815,7 @@ tzdb::locate_zone(const std::string& tz_name) const
 });
 if (li != links.end() && li->name() == tz_name)
 {
 zi = std::lower_bound(zones.begin(), zones.end(), li->target(),
 [](const time_zone& z, const std::string& nm)
 {
 return z.name() < nm;
 });
 if (zi != zones.end() && zi->name() == li->target())
 return &*zi;
 return locate_zone(li->target());
 }
#endif // !USE_OS_TZDB
 throw std::runtime_error(std::string(tz_name) + " not found in timezone database");
Expand DownExpand Up@@ -4038,6 +4101,18 @@ tzdb::current_zone() const
 if (!result.empty())
 return locate_zone(result);
#endif
 // Fall through to try other means.
 }
 {
 // On Android, it is not possible to use file based approach either,
 // we have to ask the value of `persist.sys.timezone` system property
#if defined(ANDROID) || defined(__ANDROID__)
 char sys_timezone[PROP_VALUE_MAX];
 if (__system_property_get("persist.sys.timezone", sys_timezone) > 0)
 {
 return locate_zone(sys_timezone);
 }
#endif // defined(ANDROID) || defined(__ANDROID__)
 // Fall through to try other means.
 }
 {
Expand Down

4 changes: 2 additions & 2 deletions
cpp/src/arrow/vendored/datetime/tz.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,8 +239,8 @@ nonexistent_local_time::make_msg(local_time<Duration> tp, const local_info& i)
 << i.first.abbrev << " and\n"
 << local_seconds{i.second.begin.time_since_epoch()} + i.second.offset << ' '
 << i.second.abbrev
 << " which are both equivalent to\n"
 << i.first.end << " UTC";
 << " which are both equivalent to\n";
date::operator<<(os, i.first.end) << " UTC";
 return os.str();
}

Expand Down

3 changes: 1 addition & 2 deletions
cpp/src/arrow/vendored/datetime/tz_private.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,8 +291,7 @@ struct transition
 std::ostream&
 operator<<(std::ostream& os, const transition& t)
 {
 using date::operator<<;
 os << t.timepoint << "Z ";
 date::operator<<(os, t.timepoint) << "Z ";
 if (t.info->offset >= std::chrono::seconds{0})
 os << '+';
 os << make_time(t.info->offset);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
GH-43095: [C++] Update bundled vendor/datetime to support for building with libc++ and C++20#43094

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

kou
merged 2 commits into

from

Jul 12, 2024
 Merged


GH-43095: [C++] Update bundled vendor/datetime to support for building with libc++ and C++20
#43094
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
bfe0792

update vendored/datetime

Jul 11, 2024
6391021

applying arrow specific patches

Jul 11, 2024

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


2 changes: 1 addition & 1 deletion
cpp/src/arrow/vendored/datetime/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ copies or substantial portions of the Software.
Sources for datetime are adapted from Howard Hinnant's date library
(https://github.com/HowardHinnant/date).

Sources are taken from changeset cc4685a21e4a4fdae707ad1233c61bbaff241f93
Sources are taken from changeset 1ead6715dec030d340a316c927c877a3c4e5a00c
of the above project.

The following changes are made:
Expand Down

27 changes: 19 additions & 8 deletions
cpp/src/arrow/vendored/datetime/date.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4230,7 +4230,7 @@ inline
std::basic_ostream<CharT, Traits>&
operator<<(std::basic_ostream<CharT, Traits>& os, const local_time<Duration>& ut)
{
 return (os << sys_time<Duration>{ut.time_since_epoch()});
 return (date::operator<<(os, sys_time<Duration>{ut.time_since_epoch()}));
}

namespace detail
Expand DownExpand Up@@ -6353,7 +6353,10 @@ read_signed(std::basic_istream<CharT, Traits>& is, unsigned m = 1, unsigned M =
 if (('0' <= c && c <= '9') || c == '-' || c == '+')
 {
 if (c == '-' || c == '+')
 {
 (void)is.get();
 --M;
 }
 auto x = static_cast<int>(read_unsigned(is, std::max(m, 1u), M));
 if (!is.fail())
 {
Expand DownExpand Up@@ -6526,7 +6529,14 @@ read(std::basic_istream<CharT, Traits>& is, int a0, Args&& ...args)
 *e++ = static_cast<CharT>(CharT(u % 10) + CharT{'0'});
 u /= 10;
 } while (u > 0);
#if defined(__GNUC__) && __GNUC__ >= 11
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wstringop-overflow"
#endif
 std::reverse(buf, e);
#if defined(__GNUC__) && __GNUC__ >= 11
#pragma GCC diagnostic pop
#endif
 for (auto p = buf; p != e && is.rdstate() == std::ios::goodbit; ++p)
 read(is, *p);
 }
Expand DownExpand Up@@ -6592,7 +6602,7 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,

 CONSTDATA int not_a_year = numeric_limits<short>::min();
 CONSTDATA int not_a_2digit_year = 100;
 CONSTDATA int not_a_century = not_a_year / 100;
 CONSTDATA int not_a_century = numeric_limits<int>::min();
 CONSTDATA int not_a_month = 0;
 CONSTDATA int not_a_day = 0;
 CONSTDATA int not_a_hour = numeric_limits<int>::min();
Expand DownExpand Up@@ -7519,7 +7529,12 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
 {
 auto c = static_cast<char>(Traits::to_char_type(ic));
 if (c == '-')
 {
 neg = true;
 (void)is.get();
 }
 else if (c == '+')
 (void)is.get();
 }
 if (modified == CharT{})
 {
Expand DownExpand Up@@ -7735,9 +7750,7 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
 year_month_day ymd_trial = sys_days(year{Y}/January/Sunday[1]) +
 weeks{U-1} +
 (weekday{static_cast<unsigned>(wd)} - Sunday);
 if (Y == not_a_year)
 Y = static_cast<int>(ymd_trial.year());
 else if (year{Y} != ymd_trial.year())
 if (year{Y} != ymd_trial.year())
 goto broken;
 if (m == not_a_month)
 m = static_cast<int>(static_cast<unsigned>(ymd_trial.month()));
Expand All@@ -7754,9 +7767,7 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
 year_month_day ymd_trial = sys_days(year{Y}/January/Monday[1]) +
 weeks{W-1} +
 (weekday{static_cast<unsigned>(wd)} - Monday);
 if (Y == not_a_year)
 Y = static_cast<int>(ymd_trial.year());
 else if (year{Y} != ymd_trial.year())
 if (year{Y} != ymd_trial.year())
 goto broken;
 if (m == not_a_month)
 m = static_cast<int>(static_cast<unsigned>(ymd_trial.month()));
Expand Down

95 changes: 85 additions & 10 deletions
cpp/src/arrow/vendored/datetime/tz.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,10 @@
# define TARGET_OS_SIMULATOR 0
#endif

#if defined(ANDROID) || defined(__ANDROID__)
#include <sys/system_properties.h>
#endif

#if USE_OS_TZDB
# include <dirent.h>
#endif
Expand DownExpand Up@@ -2709,7 +2713,8 @@ operator<<(std::ostream& os, const time_zone& z)
 os.width(8);
 os << s.format_ << " ";
 os << s.until_year_ << ' ' << s.until_date_;
 os << " " << s.until_utc_ << " UTC";
 os << " ";
 date::operator<<(os, s.until_utc_) << " UTC";
 os << " " << s.until_std_ << " STD";
 os << " " << s.until_loc_;
 os << " " << make_time(s.initial_save_);
Expand All@@ -2734,8 +2739,7 @@ operator<<(std::ostream& os, const time_zone& z)
std::ostream&
operator<<(std::ostream& os, const leap_second& x)
{
 using namespace date;
 return os << x.date_ << " +";
 return date::operator<<(os, x.date_) << " +";
}

#if USE_OS_TZDB
Expand DownExpand Up@@ -3716,13 +3720,78 @@ get_tzdb()
 return get_tzdb_list().front();
}

namespace {

class recursion_limiter
{
 unsigned depth_ = 0;
 unsigned limit_;

 class restore_recursion_depth;

public:
 recursion_limiter(recursion_limiter const&) = delete;
 recursion_limiter& operator=(recursion_limiter const&) = delete;

 explicit constexpr recursion_limiter(unsigned limit) noexcept;

 restore_recursion_depth count();
};

class recursion_limiter::restore_recursion_depth
{
 recursion_limiter* rc_;

public:
 ~restore_recursion_depth();
 restore_recursion_depth(restore_recursion_depth&&) = default;

 explicit restore_recursion_depth(recursion_limiter* rc) noexcept;
};

inline
recursion_limiter::restore_recursion_depth::~restore_recursion_depth()
{
 --(rc_->depth_);
}

inline
recursion_limiter::restore_recursion_depth::restore_recursion_depth(recursion_limiter* rc)
 noexcept
 : rc_{rc}
{}

inline
constexpr
recursion_limiter::recursion_limiter(unsigned limit) noexcept
 : limit_{limit}
{
}

inline
recursion_limiter::restore_recursion_depth
recursion_limiter::count()
{
 ++depth_;
 if (depth_ > limit_)
 throw std::runtime_error("recursion limit of " +
 std::to_string(limit_) + " exceeded");
 return restore_recursion_depth{this};
}

} // unnamed namespace

const time_zone*
#if HAS_STRING_VIEW
tzdb::locate_zone(std::string_view tz_name) const
#else
tzdb::locate_zone(const std::string& tz_name) const
#endif
{
 // If a link-to-link chain exceeds this limit, give up
 thread_local recursion_limiter rc{10};
 auto restore_count = rc.count();

 auto zi = std::lower_bound(zones.begin(), zones.end(), tz_name,
#if HAS_STRING_VIEW
 [](const time_zone& z, const std::string_view& nm)
Expand All@@ -3746,13 +3815,7 @@ tzdb::locate_zone(const std::string& tz_name) const
 });
 if (li != links.end() && li->name() == tz_name)
 {
 zi = std::lower_bound(zones.begin(), zones.end(), li->target(),
 [](const time_zone& z, const std::string& nm)
 {
 return z.name() < nm;
 });
 if (zi != zones.end() && zi->name() == li->target())
 return &*zi;
 return locate_zone(li->target());
 }
#endif // !USE_OS_TZDB
 throw std::runtime_error(std::string(tz_name) + " not found in timezone database");
Expand DownExpand Up@@ -4038,6 +4101,18 @@ tzdb::current_zone() const
 if (!result.empty())
 return locate_zone(result);
#endif
 // Fall through to try other means.
 }
 {
 // On Android, it is not possible to use file based approach either,
 // we have to ask the value of `persist.sys.timezone` system property
#if defined(ANDROID) || defined(__ANDROID__)
 char sys_timezone[PROP_VALUE_MAX];
 if (__system_property_get("persist.sys.timezone", sys_timezone) > 0)
 {
 return locate_zone(sys_timezone);
 }
#endif // defined(ANDROID) || defined(__ANDROID__)
 // Fall through to try other means.
 }
 {
Expand Down

4 changes: 2 additions & 2 deletions
cpp/src/arrow/vendored/datetime/tz.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,8 +239,8 @@ nonexistent_local_time::make_msg(local_time<Duration> tp, const local_info& i)
 << i.first.abbrev << " and\n"
 << local_seconds{i.second.begin.time_since_epoch()} + i.second.offset << ' '
 << i.second.abbrev
 << " which are both equivalent to\n"
 << i.first.end << " UTC";
 << " which are both equivalent to\n";
date::operator<<(os, i.first.end) << " UTC";
 return os.str();
}

Expand Down

3 changes: 1 addition & 2 deletions
cpp/src/arrow/vendored/datetime/tz_private.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,8 +291,7 @@ struct transition
 std::ostream&
 operator<<(std::ostream& os, const transition& t)
 {
 using date::operator<<;
 os << t.timepoint << "Z ";
 date::operator<<(os, t.timepoint) << "Z ";
 if (t.info->offset >= std::chrono::seconds{0})
 os << '+';
 os << make_time(t.info->offset);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
GH-43095: [C++] Update bundled vendor/datetime to support for building with libc++ and C++20#43094

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

kou
merged 2 commits into

from

Jul 12, 2024
 Merged


GH-43095: [C++] Update bundled vendor/datetime to support for building with libc++ and C++20
#43094
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
bfe0792

update vendored/datetime

Jul 11, 2024
6391021

applying arrow specific patches

Jul 11, 2024

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


2 changes: 1 addition & 1 deletion
cpp/src/arrow/vendored/datetime/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ copies or substantial portions of the Software.
Sources for datetime are adapted from Howard Hinnant's date library
(https://github.com/HowardHinnant/date).

Sources are taken from changeset cc4685a21e4a4fdae707ad1233c61bbaff241f93
Sources are taken from changeset 1ead6715dec030d340a316c927c877a3c4e5a00c
of the above project.

The following changes are made:
Expand Down

27 changes: 19 additions & 8 deletions
cpp/src/arrow/vendored/datetime/date.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4230,7 +4230,7 @@ inline
std::basic_ostream<CharT, Traits>&
operator<<(std::basic_ostream<CharT, Traits>& os, const local_time<Duration>& ut)
{
 return (os << sys_time<Duration>{ut.time_since_epoch()});
 return (date::operator<<(os, sys_time<Duration>{ut.time_since_epoch()}));
}

namespace detail
Expand DownExpand Up@@ -6353,7 +6353,10 @@ read_signed(std::basic_istream<CharT, Traits>& is, unsigned m = 1, unsigned M =
 if (('0' <= c && c <= '9') || c == '-' || c == '+')
 {
 if (c == '-' || c == '+')
 {
 (void)is.get();
 --M;
 }
 auto x = static_cast<int>(read_unsigned(is, std::max(m, 1u), M));
 if (!is.fail())
 {
Expand DownExpand Up@@ -6526,7 +6529,14 @@ read(std::basic_istream<CharT, Traits>& is, int a0, Args&& ...args)
 *e++ = static_cast<CharT>(CharT(u % 10) + CharT{'0'});
 u /= 10;
 } while (u > 0);
#if defined(__GNUC__) && __GNUC__ >= 11
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wstringop-overflow"
#endif
 std::reverse(buf, e);
#if defined(__GNUC__) && __GNUC__ >= 11
#pragma GCC diagnostic pop
#endif
 for (auto p = buf; p != e && is.rdstate() == std::ios::goodbit; ++p)
 read(is, *p);
 }
Expand DownExpand Up@@ -6592,7 +6602,7 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,

 CONSTDATA int not_a_year = numeric_limits<short>::min();
 CONSTDATA int not_a_2digit_year = 100;
 CONSTDATA int not_a_century = not_a_year / 100;
 CONSTDATA int not_a_century = numeric_limits<int>::min();
 CONSTDATA int not_a_month = 0;
 CONSTDATA int not_a_day = 0;
 CONSTDATA int not_a_hour = numeric_limits<int>::min();
Expand DownExpand Up@@ -7519,7 +7529,12 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
 {
 auto c = static_cast<char>(Traits::to_char_type(ic));
 if (c == '-')
 {
 neg = true;
 (void)is.get();
 }
 else if (c == '+')
 (void)is.get();
 }
 if (modified == CharT{})
 {
Expand DownExpand Up@@ -7735,9 +7750,7 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
 year_month_day ymd_trial = sys_days(year{Y}/January/Sunday[1]) +
 weeks{U-1} +
 (weekday{static_cast<unsigned>(wd)} - Sunday);
 if (Y == not_a_year)
 Y = static_cast<int>(ymd_trial.year());
 else if (year{Y} != ymd_trial.year())
 if (year{Y} != ymd_trial.year())
 goto broken;
 if (m == not_a_month)
 m = static_cast<int>(static_cast<unsigned>(ymd_trial.month()));
Expand All@@ -7754,9 +7767,7 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
 year_month_day ymd_trial = sys_days(year{Y}/January/Monday[1]) +
 weeks{W-1} +
 (weekday{static_cast<unsigned>(wd)} - Monday);
 if (Y == not_a_year)
 Y = static_cast<int>(ymd_trial.year());
 else if (year{Y} != ymd_trial.year())
 if (year{Y} != ymd_trial.year())
 goto broken;
 if (m == not_a_month)
 m = static_cast<int>(static_cast<unsigned>(ymd_trial.month()));
Expand Down

95 changes: 85 additions & 10 deletions
cpp/src/arrow/vendored/datetime/tz.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,10 @@
# define TARGET_OS_SIMULATOR 0
#endif

#if defined(ANDROID) || defined(__ANDROID__)
#include <sys/system_properties.h>
#endif

#if USE_OS_TZDB
# include <dirent.h>
#endif
Expand DownExpand Up@@ -2709,7 +2713,8 @@ operator<<(std::ostream& os, const time_zone& z)
 os.width(8);
 os << s.format_ << " ";
 os << s.until_year_ << ' ' << s.until_date_;
 os << " " << s.until_utc_ << " UTC";
 os << " ";
 date::operator<<(os, s.until_utc_) << " UTC";
 os << " " << s.until_std_ << " STD";
 os << " " << s.until_loc_;
 os << " " << make_time(s.initial_save_);
Expand All@@ -2734,8 +2739,7 @@ operator<<(std::ostream& os, const time_zone& z)
std::ostream&
operator<<(std::ostream& os, const leap_second& x)
{
 using namespace date;
 return os << x.date_ << " +";
 return date::operator<<(os, x.date_) << " +";
}

#if USE_OS_TZDB
Expand DownExpand Up@@ -3716,13 +3720,78 @@ get_tzdb()
 return get_tzdb_list().front();
}

namespace {

class recursion_limiter
{
 unsigned depth_ = 0;
 unsigned limit_;

 class restore_recursion_depth;

public:
 recursion_limiter(recursion_limiter const&) = delete;
 recursion_limiter& operator=(recursion_limiter const&) = delete;

 explicit constexpr recursion_limiter(unsigned limit) noexcept;

 restore_recursion_depth count();
};

class recursion_limiter::restore_recursion_depth
{
 recursion_limiter* rc_;

public:
 ~restore_recursion_depth();
 restore_recursion_depth(restore_recursion_depth&&) = default;

 explicit restore_recursion_depth(recursion_limiter* rc) noexcept;
};

inline
recursion_limiter::restore_recursion_depth::~restore_recursion_depth()
{
 --(rc_->depth_);
}

inline
recursion_limiter::restore_recursion_depth::restore_recursion_depth(recursion_limiter* rc)
 noexcept
 : rc_{rc}
{}

inline
constexpr
recursion_limiter::recursion_limiter(unsigned limit) noexcept
 : limit_{limit}
{
}

inline
recursion_limiter::restore_recursion_depth
recursion_limiter::count()
{
 ++depth_;
 if (depth_ > limit_)
 throw std::runtime_error("recursion limit of " +
 std::to_string(limit_) + " exceeded");
 return restore_recursion_depth{this};
}

} // unnamed namespace

const time_zone*
#if HAS_STRING_VIEW
tzdb::locate_zone(std::string_view tz_name) const
#else
tzdb::locate_zone(const std::string& tz_name) const
#endif
{
 // If a link-to-link chain exceeds this limit, give up
 thread_local recursion_limiter rc{10};
 auto restore_count = rc.count();

 auto zi = std::lower_bound(zones.begin(), zones.end(), tz_name,
#if HAS_STRING_VIEW
 [](const time_zone& z, const std::string_view& nm)
Expand All@@ -3746,13 +3815,7 @@ tzdb::locate_zone(const std::string& tz_name) const
 });
 if (li != links.end() && li->name() == tz_name)
 {
 zi = std::lower_bound(zones.begin(), zones.end(), li->target(),
 [](const time_zone& z, const std::string& nm)
 {
 return z.name() < nm;
 });
 if (zi != zones.end() && zi->name() == li->target())
 return &*zi;
 return locate_zone(li->target());
 }
#endif // !USE_OS_TZDB
 throw std::runtime_error(std::string(tz_name) + " not found in timezone database");
Expand DownExpand Up@@ -4038,6 +4101,18 @@ tzdb::current_zone() const
 if (!result.empty())
 return locate_zone(result);
#endif
 // Fall through to try other means.
 }
 {
 // On Android, it is not possible to use file based approach either,
 // we have to ask the value of `persist.sys.timezone` system property
#if defined(ANDROID) || defined(__ANDROID__)
 char sys_timezone[PROP_VALUE_MAX];
 if (__system_property_get("persist.sys.timezone", sys_timezone) > 0)
 {
 return locate_zone(sys_timezone);
 }
#endif // defined(ANDROID) || defined(__ANDROID__)
 // Fall through to try other means.
 }
 {
Expand Down

4 changes: 2 additions & 2 deletions
cpp/src/arrow/vendored/datetime/tz.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,8 +239,8 @@ nonexistent_local_time::make_msg(local_time<Duration> tp, const local_info& i)
 << i.first.abbrev << " and\n"
 << local_seconds{i.second.begin.time_since_epoch()} + i.second.offset << ' '
 << i.second.abbrev
 << " which are both equivalent to\n"
 << i.first.end << " UTC";
 << " which are both equivalent to\n";
date::operator<<(os, i.first.end) << " UTC";
 return os.str();
}

Expand Down

3 changes: 1 addition & 2 deletions
cpp/src/arrow/vendored/datetime/tz_private.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,8 +291,7 @@ struct transition
 std::ostream&
 operator<<(std::ostream& os, const transition& t)
 {
 using date::operator<<;
 os << t.timepoint << "Z ";
 date::operator<<(os, t.timepoint) << "Z ";
 if (t.info->offset >= std::chrono::seconds{0})
 os << '+';
 os << make_time(t.info->offset);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
GH-43095: [C++] Update bundled vendor/datetime to support for building with libc++ and C++20#43094

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

kou
merged 2 commits into

from

Jul 12, 2024
 Merged


GH-43095: [C++] Update bundled vendor/datetime to support for building with libc++ and C++20
#43094
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
bfe0792

update vendored/datetime

Jul 11, 2024
6391021

applying arrow specific patches

Jul 11, 2024

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


2 changes: 1 addition & 1 deletion
cpp/src/arrow/vendored/datetime/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ copies or substantial portions of the Software.
Sources for datetime are adapted from Howard Hinnant's date library
(https://github.com/HowardHinnant/date).

Sources are taken from changeset cc4685a21e4a4fdae707ad1233c61bbaff241f93
Sources are taken from changeset 1ead6715dec030d340a316c927c877a3c4e5a00c
of the above project.

The following changes are made:
Expand Down

27 changes: 19 additions & 8 deletions
cpp/src/arrow/vendored/datetime/date.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4230,7 +4230,7 @@ inline
std::basic_ostream<CharT, Traits>&
operator<<(std::basic_ostream<CharT, Traits>& os, const local_time<Duration>& ut)
{
 return (os << sys_time<Duration>{ut.time_since_epoch()});
 return (date::operator<<(os, sys_time<Duration>{ut.time_since_epoch()}));
}

namespace detail
Expand DownExpand Up@@ -6353,7 +6353,10 @@ read_signed(std::basic_istream<CharT, Traits>& is, unsigned m = 1, unsigned M =
 if (('0' <= c && c <= '9') || c == '-' || c == '+')
 {
 if (c == '-' || c == '+')
 {
 (void)is.get();
 --M;
 }
 auto x = static_cast<int>(read_unsigned(is, std::max(m, 1u), M));
 if (!is.fail())
 {
Expand DownExpand Up@@ -6526,7 +6529,14 @@ read(std::basic_istream<CharT, Traits>& is, int a0, Args&& ...args)
 *e++ = static_cast<CharT>(CharT(u % 10) + CharT{'0'});
 u /= 10;
 } while (u > 0);
#if defined(__GNUC__) && __GNUC__ >= 11
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wstringop-overflow"
#endif
 std::reverse(buf, e);
#if defined(__GNUC__) && __GNUC__ >= 11
#pragma GCC diagnostic pop
#endif
 for (auto p = buf; p != e && is.rdstate() == std::ios::goodbit; ++p)
 read(is, *p);
 }
Expand DownExpand Up@@ -6592,7 +6602,7 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,

 CONSTDATA int not_a_year = numeric_limits<short>::min();
 CONSTDATA int not_a_2digit_year = 100;
 CONSTDATA int not_a_century = not_a_year / 100;
 CONSTDATA int not_a_century = numeric_limits<int>::min();
 CONSTDATA int not_a_month = 0;
 CONSTDATA int not_a_day = 0;
 CONSTDATA int not_a_hour = numeric_limits<int>::min();
Expand DownExpand Up@@ -7519,7 +7529,12 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
 {
 auto c = static_cast<char>(Traits::to_char_type(ic));
 if (c == '-')
 {
 neg = true;
 (void)is.get();
 }
 else if (c == '+')
 (void)is.get();
 }
 if (modified == CharT{})
 {
Expand DownExpand Up@@ -7735,9 +7750,7 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
 year_month_day ymd_trial = sys_days(year{Y}/January/Sunday[1]) +
 weeks{U-1} +
 (weekday{static_cast<unsigned>(wd)} - Sunday);
 if (Y == not_a_year)
 Y = static_cast<int>(ymd_trial.year());
 else if (year{Y} != ymd_trial.year())
 if (year{Y} != ymd_trial.year())
 goto broken;
 if (m == not_a_month)
 m = static_cast<int>(static_cast<unsigned>(ymd_trial.month()));
Expand All@@ -7754,9 +7767,7 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
 year_month_day ymd_trial = sys_days(year{Y}/January/Monday[1]) +
 weeks{W-1} +
 (weekday{static_cast<unsigned>(wd)} - Monday);
 if (Y == not_a_year)
 Y = static_cast<int>(ymd_trial.year());
 else if (year{Y} != ymd_trial.year())
 if (year{Y} != ymd_trial.year())
 goto broken;
 if (m == not_a_month)
 m = static_cast<int>(static_cast<unsigned>(ymd_trial.month()));
Expand Down

95 changes: 85 additions & 10 deletions
cpp/src/arrow/vendored/datetime/tz.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,10 @@
# define TARGET_OS_SIMULATOR 0
#endif

#if defined(ANDROID) || defined(__ANDROID__)
#include <sys/system_properties.h>
#endif

#if USE_OS_TZDB
# include <dirent.h>
#endif
Expand DownExpand Up@@ -2709,7 +2713,8 @@ operator<<(std::ostream& os, const time_zone& z)
 os.width(8);
 os << s.format_ << " ";
 os << s.until_year_ << ' ' << s.until_date_;
 os << " " << s.until_utc_ << " UTC";
 os << " ";
 date::operator<<(os, s.until_utc_) << " UTC";
 os << " " << s.until_std_ << " STD";
 os << " " << s.until_loc_;
 os << " " << make_time(s.initial_save_);
Expand All@@ -2734,8 +2739,7 @@ operator<<(std::ostream& os, const time_zone& z)
std::ostream&
operator<<(std::ostream& os, const leap_second& x)
{
 using namespace date;
 return os << x.date_ << " +";
 return date::operator<<(os, x.date_) << " +";
}

#if USE_OS_TZDB
Expand DownExpand Up@@ -3716,13 +3720,78 @@ get_tzdb()
 return get_tzdb_list().front();
}

namespace {

class recursion_limiter
{
 unsigned depth_ = 0;
 unsigned limit_;

 class restore_recursion_depth;

public:
 recursion_limiter(recursion_limiter const&) = delete;
 recursion_limiter& operator=(recursion_limiter const&) = delete;

 explicit constexpr recursion_limiter(unsigned limit) noexcept;

 restore_recursion_depth count();
};

class recursion_limiter::restore_recursion_depth
{
 recursion_limiter* rc_;

public:
 ~restore_recursion_depth();
 restore_recursion_depth(restore_recursion_depth&&) = default;

 explicit restore_recursion_depth(recursion_limiter* rc) noexcept;
};

inline
recursion_limiter::restore_recursion_depth::~restore_recursion_depth()
{
 --(rc_->depth_);
}

inline
recursion_limiter::restore_recursion_depth::restore_recursion_depth(recursion_limiter* rc)
 noexcept
 : rc_{rc}
{}

inline
constexpr
recursion_limiter::recursion_limiter(unsigned limit) noexcept
 : limit_{limit}
{
}

inline
recursion_limiter::restore_recursion_depth
recursion_limiter::count()
{
 ++depth_;
 if (depth_ > limit_)
 throw std::runtime_error("recursion limit of " +
 std::to_string(limit_) + " exceeded");
 return restore_recursion_depth{this};
}

} // unnamed namespace

const time_zone*
#if HAS_STRING_VIEW
tzdb::locate_zone(std::string_view tz_name) const
#else
tzdb::locate_zone(const std::string& tz_name) const
#endif
{
 // If a link-to-link chain exceeds this limit, give up
 thread_local recursion_limiter rc{10};
 auto restore_count = rc.count();

 auto zi = std::lower_bound(zones.begin(), zones.end(), tz_name,
#if HAS_STRING_VIEW
 [](const time_zone& z, const std::string_view& nm)
Expand All@@ -3746,13 +3815,7 @@ tzdb::locate_zone(const std::string& tz_name) const
 });
 if (li != links.end() && li->name() == tz_name)
 {
 zi = std::lower_bound(zones.begin(), zones.end(), li->target(),
 [](const time_zone& z, const std::string& nm)
 {
 return z.name() < nm;
 });
 if (zi != zones.end() && zi->name() == li->target())
 return &*zi;
 return locate_zone(li->target());
 }
#endif // !USE_OS_TZDB
 throw std::runtime_error(std::string(tz_name) + " not found in timezone database");
Expand DownExpand Up@@ -4038,6 +4101,18 @@ tzdb::current_zone() const
 if (!result.empty())
 return locate_zone(result);
#endif
 // Fall through to try other means.
 }
 {
 // On Android, it is not possible to use file based approach either,
 // we have to ask the value of `persist.sys.timezone` system property
#if defined(ANDROID) || defined(__ANDROID__)
 char sys_timezone[PROP_VALUE_MAX];
 if (__system_property_get("persist.sys.timezone", sys_timezone) > 0)
 {
 return locate_zone(sys_timezone);
 }
#endif // defined(ANDROID) || defined(__ANDROID__)
 // Fall through to try other means.
 }
 {
Expand Down

4 changes: 2 additions & 2 deletions
cpp/src/arrow/vendored/datetime/tz.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,8 +239,8 @@ nonexistent_local_time::make_msg(local_time<Duration> tp, const local_info& i)
 << i.first.abbrev << " and\n"
 << local_seconds{i.second.begin.time_since_epoch()} + i.second.offset << ' '
 << i.second.abbrev
 << " which are both equivalent to\n"
 << i.first.end << " UTC";
 << " which are both equivalent to\n";
date::operator<<(os, i.first.end) << " UTC";
 return os.str();
}

Expand Down

3 changes: 1 addition & 2 deletions
cpp/src/arrow/vendored/datetime/tz_private.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,8 +291,7 @@ struct transition
 std::ostream&
 operator<<(std::ostream& os, const transition& t)
 {
 using date::operator<<;
 os << t.timepoint << "Z ";
 date::operator<<(os, t.timepoint) << "Z ";
 if (t.info->offset >= std::chrono::seconds{0})
 os << '+';
 os << make_time(t.info->offset);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
GH-43095: [C++] Update bundled vendor/datetime to support for building with libc++ and C++20#43094

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

kou
merged 2 commits into

from

Jul 12, 2024
 Merged


GH-43095: [C++] Update bundled vendor/datetime to support for building with libc++ and C++20
#43094
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
bfe0792

update vendored/datetime

Jul 11, 2024
6391021

applying arrow specific patches

Jul 11, 2024

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


2 changes: 1 addition & 1 deletion
cpp/src/arrow/vendored/datetime/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ copies or substantial portions of the Software.
Sources for datetime are adapted from Howard Hinnant's date library
(https://github.com/HowardHinnant/date).

Sources are taken from changeset cc4685a21e4a4fdae707ad1233c61bbaff241f93
Sources are taken from changeset 1ead6715dec030d340a316c927c877a3c4e5a00c
of the above project.

The following changes are made:
Expand Down

27 changes: 19 additions & 8 deletions
cpp/src/arrow/vendored/datetime/date.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4230,7 +4230,7 @@ inline
std::basic_ostream<CharT, Traits>&
operator<<(std::basic_ostream<CharT, Traits>& os, const local_time<Duration>& ut)
{
 return (os << sys_time<Duration>{ut.time_since_epoch()});
 return (date::operator<<(os, sys_time<Duration>{ut.time_since_epoch()}));
}

namespace detail
Expand DownExpand Up@@ -6353,7 +6353,10 @@ read_signed(std::basic_istream<CharT, Traits>& is, unsigned m = 1, unsigned M =
 if (('0' <= c && c <= '9') || c == '-' || c == '+')
 {
 if (c == '-' || c == '+')
 {
 (void)is.get();
 --M;
 }
 auto x = static_cast<int>(read_unsigned(is, std::max(m, 1u), M));
 if (!is.fail())
 {
Expand DownExpand Up@@ -6526,7 +6529,14 @@ read(std::basic_istream<CharT, Traits>& is, int a0, Args&& ...args)
 *e++ = static_cast<CharT>(CharT(u % 10) + CharT{'0'});
 u /= 10;
 } while (u > 0);
#if defined(__GNUC__) && __GNUC__ >= 11
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wstringop-overflow"
#endif
 std::reverse(buf, e);
#if defined(__GNUC__) && __GNUC__ >= 11
#pragma GCC diagnostic pop
#endif
 for (auto p = buf; p != e && is.rdstate() == std::ios::goodbit; ++p)
 read(is, *p);
 }
Expand DownExpand Up@@ -6592,7 +6602,7 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,

 CONSTDATA int not_a_year = numeric_limits<short>::min();
 CONSTDATA int not_a_2digit_year = 100;
 CONSTDATA int not_a_century = not_a_year / 100;
 CONSTDATA int not_a_century = numeric_limits<int>::min();
 CONSTDATA int not_a_month = 0;
 CONSTDATA int not_a_day = 0;
 CONSTDATA int not_a_hour = numeric_limits<int>::min();
Expand DownExpand Up@@ -7519,7 +7529,12 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
 {
 auto c = static_cast<char>(Traits::to_char_type(ic));
 if (c == '-')
 {
 neg = true;
 (void)is.get();
 }
 else if (c == '+')
 (void)is.get();
 }
 if (modified == CharT{})
 {
Expand DownExpand Up@@ -7735,9 +7750,7 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
 year_month_day ymd_trial = sys_days(year{Y}/January/Sunday[1]) +
 weeks{U-1} +
 (weekday{static_cast<unsigned>(wd)} - Sunday);
 if (Y == not_a_year)
 Y = static_cast<int>(ymd_trial.year());
 else if (year{Y} != ymd_trial.year())
 if (year{Y} != ymd_trial.year())
 goto broken;
 if (m == not_a_month)
 m = static_cast<int>(static_cast<unsigned>(ymd_trial.month()));
Expand All@@ -7754,9 +7767,7 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
 year_month_day ymd_trial = sys_days(year{Y}/January/Monday[1]) +
 weeks{W-1} +
 (weekday{static_cast<unsigned>(wd)} - Monday);
 if (Y == not_a_year)
 Y = static_cast<int>(ymd_trial.year());
 else if (year{Y} != ymd_trial.year())
 if (year{Y} != ymd_trial.year())
 goto broken;
 if (m == not_a_month)
 m = static_cast<int>(static_cast<unsigned>(ymd_trial.month()));
Expand Down

95 changes: 85 additions & 10 deletions
cpp/src/arrow/vendored/datetime/tz.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,10 @@
# define TARGET_OS_SIMULATOR 0
#endif

#if defined(ANDROID) || defined(__ANDROID__)
#include <sys/system_properties.h>
#endif

#if USE_OS_TZDB
# include <dirent.h>
#endif
Expand DownExpand Up@@ -2709,7 +2713,8 @@ operator<<(std::ostream& os, const time_zone& z)
 os.width(8);
 os << s.format_ << " ";
 os << s.until_year_ << ' ' << s.until_date_;
 os << " " << s.until_utc_ << " UTC";
 os << " ";
 date::operator<<(os, s.until_utc_) << " UTC";
 os << " " << s.until_std_ << " STD";
 os << " " << s.until_loc_;
 os << " " << make_time(s.initial_save_);
Expand All@@ -2734,8 +2739,7 @@ operator<<(std::ostream& os, const time_zone& z)
std::ostream&
operator<<(std::ostream& os, const leap_second& x)
{
 using namespace date;
 return os << x.date_ << " +";
 return date::operator<<(os, x.date_) << " +";
}

#if USE_OS_TZDB
Expand DownExpand Up@@ -3716,13 +3720,78 @@ get_tzdb()
 return get_tzdb_list().front();
}

namespace {

class recursion_limiter
{
 unsigned depth_ = 0;
 unsigned limit_;

 class restore_recursion_depth;

public:
 recursion_limiter(recursion_limiter const&) = delete;
 recursion_limiter& operator=(recursion_limiter const&) = delete;

 explicit constexpr recursion_limiter(unsigned limit) noexcept;

 restore_recursion_depth count();
};

class recursion_limiter::restore_recursion_depth
{
 recursion_limiter* rc_;

public:
 ~restore_recursion_depth();
 restore_recursion_depth(restore_recursion_depth&&) = default;

 explicit restore_recursion_depth(recursion_limiter* rc) noexcept;
};

inline
recursion_limiter::restore_recursion_depth::~restore_recursion_depth()
{
 --(rc_->depth_);
}

inline
recursion_limiter::restore_recursion_depth::restore_recursion_depth(recursion_limiter* rc)
 noexcept
 : rc_{rc}
{}

inline
constexpr
recursion_limiter::recursion_limiter(unsigned limit) noexcept
 : limit_{limit}
{
}

inline
recursion_limiter::restore_recursion_depth
recursion_limiter::count()
{
 ++depth_;
 if (depth_ > limit_)
 throw std::runtime_error("recursion limit of " +
 std::to_string(limit_) + " exceeded");
 return restore_recursion_depth{this};
}

} // unnamed namespace

const time_zone*
#if HAS_STRING_VIEW
tzdb::locate_zone(std::string_view tz_name) const
#else
tzdb::locate_zone(const std::string& tz_name) const
#endif
{
 // If a link-to-link chain exceeds this limit, give up
 thread_local recursion_limiter rc{10};
 auto restore_count = rc.count();

 auto zi = std::lower_bound(zones.begin(), zones.end(), tz_name,
#if HAS_STRING_VIEW
 [](const time_zone& z, const std::string_view& nm)
Expand All@@ -3746,13 +3815,7 @@ tzdb::locate_zone(const std::string& tz_name) const
 });
 if (li != links.end() && li->name() == tz_name)
 {
 zi = std::lower_bound(zones.begin(), zones.end(), li->target(),
 [](const time_zone& z, const std::string& nm)
 {
 return z.name() < nm;
 });
 if (zi != zones.end() && zi->name() == li->target())
 return &*zi;
 return locate_zone(li->target());
 }
#endif // !USE_OS_TZDB
 throw std::runtime_error(std::string(tz_name) + " not found in timezone database");
Expand DownExpand Up@@ -4038,6 +4101,18 @@ tzdb::current_zone() const
 if (!result.empty())
 return locate_zone(result);
#endif
 // Fall through to try other means.
 }
 {
 // On Android, it is not possible to use file based approach either,
 // we have to ask the value of `persist.sys.timezone` system property
#if defined(ANDROID) || defined(__ANDROID__)
 char sys_timezone[PROP_VALUE_MAX];
 if (__system_property_get("persist.sys.timezone", sys_timezone) > 0)
 {
 return locate_zone(sys_timezone);
 }
#endif // defined(ANDROID) || defined(__ANDROID__)
 // Fall through to try other means.
 }
 {
Expand Down

4 changes: 2 additions & 2 deletions
cpp/src/arrow/vendored/datetime/tz.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,8 +239,8 @@ nonexistent_local_time::make_msg(local_time<Duration> tp, const local_info& i)
 << i.first.abbrev << " and\n"
 << local_seconds{i.second.begin.time_since_epoch()} + i.second.offset << ' '
 << i.second.abbrev
 << " which are both equivalent to\n"
 << i.first.end << " UTC";
 << " which are both equivalent to\n";
date::operator<<(os, i.first.end) << " UTC";
 return os.str();
}

Expand Down

3 changes: 1 addition & 2 deletions
cpp/src/arrow/vendored/datetime/tz_private.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,8 +291,7 @@ struct transition
 std::ostream&
 operator<<(std::ostream& os, const transition& t)
 {
 using date::operator<<;
 os << t.timepoint << "Z ";
 date::operator<<(os, t.timepoint) << "Z ";
 if (t.info->offset >= std::chrono::seconds{0})
 os << '+';
 os << make_time(t.info->offset);
Expand Down