GH-35594: [R][C++] Bump vendored date library#35612

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
pitrou merged 3 commits into from
May 16, 2023
Merged

GH-35594: [R][C++] Bump vendored date library #35612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb4465c
Bump vendored version of date to cc4685a21e4a4fdae707ad1233c61bbaff24…
thisisnic May 16, 2023
4f77b9e
Update date.h
thisisnic May 16, 2023
2d79106
Update tz.h
thisisnic May 16, 2023
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 2e19c006e2218447ee31f864191859517603f59f
Sources are taken from changeset cc4685a21e4a4fdae707ad1233c61bbaff241f93
of the above project.

The following changes are made:
Expand Down
6 changes: 3 additions & 3 deletions cpp/src/arrow/vendored/datetime/date.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1318,7 +1318,7 @@ CONSTCD11
std::chrono::duration<Rep, Period>
abs(std::chrono::duration<Rep, Period> d)
{
return d >= d.zero() ? d : -d;
return d >= d.zero() ? d : static_cast<decltype(d)>(-d);
}

// round down
Expand DownExpand Up@@ -4208,8 +4208,8 @@ template <class CharT, class Traits, class Duration>
inline
typename std::enable_if
<
std::ratio_less<typename Duration::period, days::period>::value
, std::basic_ostream<CharT, Traits>&
!std::is_convertible<Duration, days>::value,
std::basic_ostream<CharT, Traits>&
>::type
operator<<(std::basic_ostream<CharT, Traits>& os, const sys_time<Duration>& tp)
{
Expand Down
186 changes: 157 additions & 29 deletions cpp/src/arrow/vendored/datetime/tz.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -202,6 +202,35 @@ namespace
using co_task_mem_ptr = std::unique_ptr<wchar_t[], task_mem_deleter>;
}

static
std::wstring
convert_utf8_to_utf16(const std::string& s)
{
std::wstring out;
const int size = MultiByteToWideChar(CP_UTF8, 0, s.c_str(), -1, NULL, 0);

if (size == 0)
{
std::string msg = "Failed to determine required size when converting \"";
msg += s;
msg += "\" to UTF-16.";
throw std::runtime_error(msg);
}

out.resize(size);
const int check = MultiByteToWideChar(CP_UTF8, 0, s.c_str(), -1, &out[0], size);

if (size != check)
{
std::string msg = "Failed to convert \"";
msg += s;
msg += "\" to UTF-16.";
throw std::runtime_error(msg);
}

return out;
}

// We might need to know certain locations even if not using the remote API,
// so keep these routines out of that block for now.
static
Expand DownExpand Up@@ -271,8 +300,90 @@ get_download_folder()

# endif // !_WIN32

#endif // !USE_OS_TZDB
/*
* This class is provided to mimic the following usage of `ifstream`:
*
* std::ifstream is(filename);
*
* file_streambuf ibuf(filename);
* std::istream is(&ibuf);
*
* This is required because `ifstream` does not support opening files
* containing wide characters on Windows. On Windows, `file_streambuf` uses
* `file_open()` to convert the file name to UTF-16 before opening it with
* `_wfopen()`.
*
* Note that this is not an exact re-implementation of `ifstream`,
* but is enough for usage here.
*
* It is partially based on these two implementations:
* - fdinbuf from http://www.josuttis.com/cppcode/fdstream.html
* - stdiobuf https://stackoverflow.com/questions/12342542/convert-file-to-ifstream-c-android-ndk
*
* Apparently MSVC provides non-standard overloads of `ifstream` that support
* a `const wchar_t*` file name, but MinGW does not https://stackoverflow.com/a/822032
*/
class file_streambuf
: public std::streambuf
{
private:
FILE* file_;
static const int buffer_size_ = 1024;
char buffer_[buffer_size_];

public:
~file_streambuf()
{
if (file_)
{
::fclose(file_);
}
}
file_streambuf(const file_streambuf&) = delete;
file_streambuf& operator=(const file_streambuf&) = delete;

file_streambuf(const std::string& filename)
: file_(file_open(filename))
{
}

protected:
virtual
int_type
underflow()
{
if (gptr() == egptr() && file_)
{
const size_t size = ::fread(buffer_, 1, buffer_size_, file_);
setg(buffer_, buffer_, buffer_ + size);
}
return (gptr() == egptr())
? traits_type::eof()
: traits_type::to_int_type(*gptr());
}

private:
FILE*
file_open(const std::string& filename)
{
# ifdef _WIN32
std::wstring wfilename = convert_utf8_to_utf16(filename);
FILE* file = ::_wfopen(wfilename.c_str(), L"rb");
# else // !_WIN32
FILE* file = ::fopen(filename.c_str(), "rb");
# endif // _WIN32
if (file == NULL)
{
std::string msg = "Error opening file \"";
msg += filename;
msg += "\".";
throw std::runtime_error(msg);
}
return file;
}
};

#endif // !USE_OS_TZDB
namespace arrow_vendored
{
namespace date
Expand DownExpand Up@@ -309,9 +420,9 @@ access_install()
}

void
set_install(const std::string& s)
set_install(const std::string& install)
{
access_install() = s;
access_install() = install;
}

static
Expand DownExpand Up@@ -565,15 +676,8 @@ load_timezone_mappings_from_xml_file(const std::string& input_path)
std::vector<detail::timezone_mapping> mappings;
std::string line;

std::ifstream is(input_path);
if (!is.is_open())
{
// We don't emit file exceptions because that's an implementation detail.
std::string msg = "Error opening time zone mapping file \"";
msg += input_path;
msg += "\".";
throw std::runtime_error(msg);
}
file_streambuf ibuf(input_path);
std::istream is(&ibuf);

auto error = [&input_path, &line_num](const char* info)
{
Expand DownExpand Up@@ -703,7 +807,6 @@ load_timezone_mappings_from_xml_file(const std::string& input_path)
}
}

is.close();
return mappings;
}

Expand DownExpand Up@@ -2675,16 +2778,16 @@ find_read_and_leap_seconds()
std::getline(in, line);
if (!line.empty() && line[0] != '#')
{
std::istringstream in(line);
in.exceptions(std::ios::failbit | std::ios::badbit);
std::istringstream iss(line);
iss.exceptions(std::ios::failbit | std::ios::badbit);
std::string word;
in >> word;
iss >> word;
if (word == "Leap")
{
int y, m, d;
in >> y;
m = static_cast<int>(parse_month(in));
in >> d;
iss >> y;
m = static_cast<int>(parse_month(iss));
iss >> d;
leap_seconds.push_back(leap_second(sys_days{year{y}/m/d} + days{1},
detail::undocumented{}));
}
Expand All@@ -2709,11 +2812,11 @@ find_read_and_leap_seconds()
std::getline(in, line);
if (!line.empty() && line[0] != '#')
{
std::istringstream in(line);
in.exceptions(std::ios::failbit | std::ios::badbit);
std::istringstream iss(line);
iss.exceptions(std::ios::failbit | std::ios::badbit);
using seconds = std::chrono::seconds;
seconds::rep s;
in >> s;
iss >> s;
if (s == 2272060800)
continue;
leap_seconds.push_back(leap_second(sys_seconds{seconds{s}} - offset,
Expand All@@ -2722,6 +2825,7 @@ find_read_and_leap_seconds()
}
return leap_seconds;
}
#if !MISSING_LEAP_SECONDS
in.clear();
in.open(get_tz_dir() + std::string(1, folder_delimiter) + "right/UTC",
std::ios_base::binary);
Expand All@@ -2736,6 +2840,7 @@ find_read_and_leap_seconds()
{
return load_just_leaps(in);
}
#endif
return {};
}

Expand DownExpand Up@@ -2842,7 +2947,8 @@ bool
file_exists(const std::string& filename)
{
#ifdef _WIN32
return ::_access(filename.c_str(), 0) == 0;
std::wstring wfilename = convert_utf8_to_utf16(filename);
return ::_waccess(wfilename.c_str(), 0) == 0;
#else
return ::access(filename.c_str(), F_OK) == 0;
#endif
Expand DownExpand Up@@ -3419,16 +3525,27 @@ std::string
get_version(const std::string& path)
{
std::string version;
std::ifstream infile(path + "version");
if (infile.is_open())

std::string path_version = path + "version";

if (file_exists(path_version))
{
file_streambuf inbuf(path_version);
std::istream infile(&inbuf);

infile >> version;

if (!infile.fail())
return version;
}
else

std::string path_news = path + "NEWS";

if (file_exists(path_news))
{
infile.open(path + "NEWS");
file_streambuf inbuf(path_news);
std::istream infile(&inbuf);

while (infile)
{
infile >> version;
Expand All@@ -3439,6 +3556,7 @@ get_version(const std::string& path)
}
}
}

throw std::runtime_error("Unable to get Timezone database version from " + path);
}

Expand DownExpand Up@@ -3510,7 +3628,13 @@ init_tzdb()

for (const auto& filename : files)
{
std::ifstream infile(path + filename);
std::string file_path = path + filename;
if (!file_exists(file_path))
{
continue;
}
file_streambuf inbuf(file_path);
std::istream infile(&inbuf);
while (infile)
{
std::getline(infile, line);
Expand DownExpand Up@@ -3543,6 +3667,10 @@ init_tzdb()
{
db->zones.back().add(line);
}
else if (word.size() > 0 && word[0] == '#')
{
continue;
}
else
{
std::cerr << line << '\n';
Expand DownExpand Up@@ -3925,7 +4053,7 @@ tzdb::current_zone() const
auto p = result.find("ZONE=\"");
if (p != std::string::npos)
{
result.erase(p, p+6);
result.erase(0, p+6);
result.erase(result.rfind('"'));
return locate_zone(result);
}
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@@ -60,7 +60,7 @@
# else
# define HAS_REMOTE_API 1
# endif
# else // HAS_REMOTE_API makes no since when using the OS timezone database
# else // HAS_REMOTE_API makes no sense when using the OS timezone database
# define HAS_REMOTE_API 0
# endif
#endif
Expand DownExpand Up@@ -853,7 +853,7 @@ class time_zone
load_data(std::istream& inf, std::int32_t tzh_leapcnt, std::int32_t tzh_timecnt,
std::int32_t tzh_typecnt, std::int32_t tzh_charcnt);
#else // !USE_OS_TZDB
DATE_API sys_info get_info_impl(sys_seconds tp, int timezone) const;
DATE_API sys_info get_info_impl(sys_seconds tp, int tz_int) const;
DATE_API void adjust_infos(const std::vector<detail::Rule>& rules);
DATE_API void parse_info(std::istream& in);
#endif // !USE_OS_TZDB
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} 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-35594: [R][C++] Bump vendored date library#35612

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

pitrou
merged 3 commits into

from

May 16, 2023
 Merged


GH-35594: [R][C++] Bump vendored date library
#35612
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
fb4465c

Bump vendored version of date to cc4685a21e4a4fdae707ad1233c61bbaff24…


thisisnic May 16, 2023
4f77b9e

Update date.h


thisisnic May 16, 2023
2d79106

Update tz.h


thisisnic May 16, 2023

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 2e19c006e2218447ee31f864191859517603f59f
Sources are taken from changeset cc4685a21e4a4fdae707ad1233c61bbaff241f93
of the above project.

The following changes are made:
Expand Down

6 changes: 3 additions & 3 deletions
cpp/src/arrow/vendored/datetime/date.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1318,7 +1318,7 @@ CONSTCD11
std::chrono::duration<Rep, Period>
abs(std::chrono::duration<Rep, Period> d)
{
 return d >= d.zero() ? d : -d;
 return d >= d.zero() ? d : static_cast<decltype(d)>(-d);
}

// round down
Expand DownExpand Up@@ -4208,8 +4208,8 @@ template <class CharT, class Traits, class Duration>
inline
typename std::enable_if
<
 std::ratio_less<typename Duration::period, days::period>::value
, std::basic_ostream<CharT, Traits>&
!std::is_convertible<Duration, days>::value,
 std::basic_ostream<CharT, Traits>&
>::type
operator<<(std::basic_ostream<CharT, Traits>& os, const sys_time<Duration>& tp)
{
Expand Down

186 changes: 157 additions & 29 deletions
cpp/src/arrow/vendored/datetime/tz.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -202,6 +202,35 @@ namespace
 using co_task_mem_ptr = std::unique_ptr<wchar_t[], task_mem_deleter>;
}

static
std::wstring
convert_utf8_to_utf16(const std::string& s)
{
 std::wstring out;
 const int size = MultiByteToWideChar(CP_UTF8, 0, s.c_str(), -1, NULL, 0);

 if (size == 0)
 {
 std::string msg = "Failed to determine required size when converting \"";
 msg += s;
 msg += "\" to UTF-16.";
 throw std::runtime_error(msg);
 }

 out.resize(size);
 const int check = MultiByteToWideChar(CP_UTF8, 0, s.c_str(), -1, &out[0], size);

 if (size != check)
 {
 std::string msg = "Failed to convert \"";
 msg += s;
 msg += "\" to UTF-16.";
 throw std::runtime_error(msg);
 }

 return out;
}

// We might need to know certain locations even if not using the remote API,
// so keep these routines out of that block for now.
static
Expand DownExpand Up@@ -271,8 +300,90 @@ get_download_folder()

# endif // !_WIN32

#endif // !USE_OS_TZDB
/*
 * This class is provided to mimic the following usage of `ifstream`:
 *
 * std::ifstream is(filename);
 *
 * file_streambuf ibuf(filename);
 * std::istream is(&ibuf);
 *
 * This is required because `ifstream` does not support opening files
 * containing wide characters on Windows. On Windows, `file_streambuf` uses
 * `file_open()` to convert the file name to UTF-16 before opening it with
 * `_wfopen()`.
 *
 * Note that this is not an exact re-implementation of `ifstream`,
 * but is enough for usage here.
 *
 * It is partially based on these two implementations:
 * - fdinbuf from http://www.josuttis.com/cppcode/fdstream.html
 * - stdiobuf https://stackoverflow.com/questions/12342542/convert-file-to-ifstream-c-android-ndk
 *
 * Apparently MSVC provides non-standard overloads of `ifstream` that support
 * a `const wchar_t*` file name, but MinGW does not https://stackoverflow.com/a/822032
 */
class file_streambuf
 : public std::streambuf
{
private:
 FILE* file_;
 static const int buffer_size_ = 1024;
 char buffer_[buffer_size_];

public:
 ~file_streambuf()
 {
 if (file_)
 {
 ::fclose(file_);
 }
 }
 file_streambuf(const file_streambuf&) = delete;
 file_streambuf& operator=(const file_streambuf&) = delete;

 file_streambuf(const std::string& filename)
 : file_(file_open(filename))
 {
 }

protected:
 virtual
 int_type
 underflow()
 {
 if (gptr() == egptr() && file_)
 {
 const size_t size = ::fread(buffer_, 1, buffer_size_, file_);
 setg(buffer_, buffer_, buffer_ + size);
 }
 return (gptr() == egptr())
 ? traits_type::eof()
 : traits_type::to_int_type(*gptr());
 }

private:
 FILE*
 file_open(const std::string& filename)
 {
# ifdef _WIN32
 std::wstring wfilename = convert_utf8_to_utf16(filename);
 FILE* file = ::_wfopen(wfilename.c_str(), L"rb");
# else // !_WIN32
 FILE* file = ::fopen(filename.c_str(), "rb");
# endif // _WIN32
 if (file == NULL)
 {
 std::string msg = "Error opening file \"";
 msg += filename;
 msg += "\".";
 throw std::runtime_error(msg);
 }
 return file;
 }
};

#endif // !USE_OS_TZDB
namespace arrow_vendored
{
namespace date
Expand DownExpand Up@@ -309,9 +420,9 @@ access_install()
}

void
set_install(const std::string& s)
set_install(const std::string& install)
{
 access_install() = s;
 access_install() = install;
}

static
Expand DownExpand Up@@ -565,15 +676,8 @@ load_timezone_mappings_from_xml_file(const std::string& input_path)
 std::vector<detail::timezone_mapping> mappings;
 std::string line;

 std::ifstream is(input_path);
 if (!is.is_open())
 {
 // We don't emit file exceptions because that's an implementation detail.
 std::string msg = "Error opening time zone mapping file \"";
 msg += input_path;
 msg += "\".";
 throw std::runtime_error(msg);
 }
 file_streambuf ibuf(input_path);
 std::istream is(&ibuf);

 auto error = [&input_path, &line_num](const char* info)
 {
Expand DownExpand Up@@ -703,7 +807,6 @@ load_timezone_mappings_from_xml_file(const std::string& input_path)
 }
 }

 is.close();
 return mappings;
}

Expand DownExpand Up@@ -2675,16 +2778,16 @@ find_read_and_leap_seconds()
 std::getline(in, line);
 if (!line.empty() && line[0] != '#')
 {
 std::istringstream in(line);
in.exceptions(std::ios::failbit | std::ios::badbit);
 std::istringstream iss(line);
iss.exceptions(std::ios::failbit | std::ios::badbit);
 std::string word;
in >> word;
iss >> word;
 if (word == "Leap")
 {
 int y, m, d;
in >> y;
 m = static_cast<int>(parse_month(in));
in >> d;
iss >> y;
 m = static_cast<int>(parse_month(iss));
iss >> d;
 leap_seconds.push_back(leap_second(sys_days{year{y}/m/d} + days{1},
 detail::undocumented{}));
 }
Expand All@@ -2709,11 +2812,11 @@ find_read_and_leap_seconds()
 std::getline(in, line);
 if (!line.empty() && line[0] != '#')
 {
 std::istringstream in(line);
in.exceptions(std::ios::failbit | std::ios::badbit);
 std::istringstream iss(line);
iss.exceptions(std::ios::failbit | std::ios::badbit);
 using seconds = std::chrono::seconds;
 seconds::rep s;
in >> s;
iss >> s;
 if (s == 2272060800)
 continue;
 leap_seconds.push_back(leap_second(sys_seconds{seconds{s}} - offset,
Expand All@@ -2722,6 +2825,7 @@ find_read_and_leap_seconds()
 }
 return leap_seconds;
 }
#if !MISSING_LEAP_SECONDS
 in.clear();
 in.open(get_tz_dir() + std::string(1, folder_delimiter) + "right/UTC",
 std::ios_base::binary);
Expand All@@ -2736,6 +2840,7 @@ find_read_and_leap_seconds()
 {
 return load_just_leaps(in);
 }
#endif
 return {};
}

Expand DownExpand Up@@ -2842,7 +2947,8 @@ bool
file_exists(const std::string& filename)
{
#ifdef _WIN32
 return ::_access(filename.c_str(), 0) == 0;
 std::wstring wfilename = convert_utf8_to_utf16(filename);
 return ::_waccess(wfilename.c_str(), 0) == 0;
#else
 return ::access(filename.c_str(), F_OK) == 0;
#endif
Expand DownExpand Up@@ -3419,16 +3525,27 @@ std::string
get_version(const std::string& path)
{
 std::string version;
 std::ifstream infile(path + "version");
 if (infile.is_open())

 std::string path_version = path + "version";

 if (file_exists(path_version))
 {
 file_streambuf inbuf(path_version);
 std::istream infile(&inbuf);

 infile >> version;

 if (!infile.fail())
 return version;
 }
 else

 std::string path_news = path + "NEWS";

 if (file_exists(path_news))
 {
 infile.open(path + "NEWS");
 file_streambuf inbuf(path_news);
 std::istream infile(&inbuf);

 while (infile)
 {
 infile >> version;
Expand All@@ -3439,6 +3556,7 @@ get_version(const std::string& path)
 }
 }
 }

 throw std::runtime_error("Unable to get Timezone database version from " + path);
}

Expand DownExpand Up@@ -3510,7 +3628,13 @@ init_tzdb()

 for (const auto& filename : files)
 {
 std::ifstream infile(path + filename);
 std::string file_path = path + filename;
 if (!file_exists(file_path))
 {
 continue;
 }
 file_streambuf inbuf(file_path);
 std::istream infile(&inbuf);
 while (infile)
 {
 std::getline(infile, line);
Expand DownExpand Up@@ -3543,6 +3667,10 @@ init_tzdb()
 {
 db->zones.back().add(line);
 }
 else if (word.size() > 0 && word[0] == '#')
 {
 continue;
 }
 else
 {
 std::cerr << line << '\n';
Expand DownExpand Up@@ -3925,7 +4053,7 @@ tzdb::current_zone() const
 auto p = result.find("ZONE=\"");
 if (p != std::string::npos)
 {
 result.erase(p, p+6);
 result.erase(0, p+6);
 result.erase(result.rfind('"'));
 return locate_zone(result);
 }
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@@ -60,7 +60,7 @@
# else
# define HAS_REMOTE_API 1
# endif
# else // HAS_REMOTE_API makes no since when using the OS timezone database
# else // HAS_REMOTE_API makes no sense when using the OS timezone database
# define HAS_REMOTE_API 0
# endif
#endif
Expand DownExpand Up@@ -853,7 +853,7 @@ class time_zone
 load_data(std::istream& inf, std::int32_t tzh_leapcnt, std::int32_t tzh_timecnt,
 std::int32_t tzh_typecnt, std::int32_t tzh_charcnt);
#else // !USE_OS_TZDB
 DATE_API sys_info get_info_impl(sys_seconds tp, int timezone) const;
 DATE_API sys_info get_info_impl(sys_seconds tp, int tz_int) const;
 DATE_API void adjust_infos(const std::vector<detail::Rule>& rules);
 DATE_API void parse_info(std::istream& in);
#endif // !USE_OS_TZDB
Expand Down

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

Skip to content
GH-35594: [R][C++] Bump vendored date library#35612

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

pitrou
merged 3 commits into

from

May 16, 2023
 Merged


GH-35594: [R][C++] Bump vendored date library
#35612
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
fb4465c

Bump vendored version of date to cc4685a21e4a4fdae707ad1233c61bbaff24…


thisisnic May 16, 2023
4f77b9e

Update date.h


thisisnic May 16, 2023
2d79106

Update tz.h


thisisnic May 16, 2023

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 2e19c006e2218447ee31f864191859517603f59f
Sources are taken from changeset cc4685a21e4a4fdae707ad1233c61bbaff241f93
of the above project.

The following changes are made:
Expand Down

6 changes: 3 additions & 3 deletions
cpp/src/arrow/vendored/datetime/date.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1318,7 +1318,7 @@ CONSTCD11
std::chrono::duration<Rep, Period>
abs(std::chrono::duration<Rep, Period> d)
{
 return d >= d.zero() ? d : -d;
 return d >= d.zero() ? d : static_cast<decltype(d)>(-d);
}

// round down
Expand DownExpand Up@@ -4208,8 +4208,8 @@ template <class CharT, class Traits, class Duration>
inline
typename std::enable_if
<
 std::ratio_less<typename Duration::period, days::period>::value
, std::basic_ostream<CharT, Traits>&
!std::is_convertible<Duration, days>::value,
 std::basic_ostream<CharT, Traits>&
>::type
operator<<(std::basic_ostream<CharT, Traits>& os, const sys_time<Duration>& tp)
{
Expand Down

186 changes: 157 additions & 29 deletions
cpp/src/arrow/vendored/datetime/tz.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -202,6 +202,35 @@ namespace
 using co_task_mem_ptr = std::unique_ptr<wchar_t[], task_mem_deleter>;
}

static
std::wstring
convert_utf8_to_utf16(const std::string& s)
{
 std::wstring out;
 const int size = MultiByteToWideChar(CP_UTF8, 0, s.c_str(), -1, NULL, 0);

 if (size == 0)
 {
 std::string msg = "Failed to determine required size when converting \"";
 msg += s;
 msg += "\" to UTF-16.";
 throw std::runtime_error(msg);
 }

 out.resize(size);
 const int check = MultiByteToWideChar(CP_UTF8, 0, s.c_str(), -1, &out[0], size);

 if (size != check)
 {
 std::string msg = "Failed to convert \"";
 msg += s;
 msg += "\" to UTF-16.";
 throw std::runtime_error(msg);
 }

 return out;
}

// We might need to know certain locations even if not using the remote API,
// so keep these routines out of that block for now.
static
Expand DownExpand Up@@ -271,8 +300,90 @@ get_download_folder()

# endif // !_WIN32

#endif // !USE_OS_TZDB
/*
 * This class is provided to mimic the following usage of `ifstream`:
 *
 * std::ifstream is(filename);
 *
 * file_streambuf ibuf(filename);
 * std::istream is(&ibuf);
 *
 * This is required because `ifstream` does not support opening files
 * containing wide characters on Windows. On Windows, `file_streambuf` uses
 * `file_open()` to convert the file name to UTF-16 before opening it with
 * `_wfopen()`.
 *
 * Note that this is not an exact re-implementation of `ifstream`,
 * but is enough for usage here.
 *
 * It is partially based on these two implementations:
 * - fdinbuf from http://www.josuttis.com/cppcode/fdstream.html
 * - stdiobuf https://stackoverflow.com/questions/12342542/convert-file-to-ifstream-c-android-ndk
 *
 * Apparently MSVC provides non-standard overloads of `ifstream` that support
 * a `const wchar_t*` file name, but MinGW does not https://stackoverflow.com/a/822032
 */
class file_streambuf
 : public std::streambuf
{
private:
 FILE* file_;
 static const int buffer_size_ = 1024;
 char buffer_[buffer_size_];

public:
 ~file_streambuf()
 {
 if (file_)
 {
 ::fclose(file_);
 }
 }
 file_streambuf(const file_streambuf&) = delete;
 file_streambuf& operator=(const file_streambuf&) = delete;

 file_streambuf(const std::string& filename)
 : file_(file_open(filename))
 {
 }

protected:
 virtual
 int_type
 underflow()
 {
 if (gptr() == egptr() && file_)
 {
 const size_t size = ::fread(buffer_, 1, buffer_size_, file_);
 setg(buffer_, buffer_, buffer_ + size);
 }
 return (gptr() == egptr())
 ? traits_type::eof()
 : traits_type::to_int_type(*gptr());
 }

private:
 FILE*
 file_open(const std::string& filename)
 {
# ifdef _WIN32
 std::wstring wfilename = convert_utf8_to_utf16(filename);
 FILE* file = ::_wfopen(wfilename.c_str(), L"rb");
# else // !_WIN32
 FILE* file = ::fopen(filename.c_str(), "rb");
# endif // _WIN32
 if (file == NULL)
 {
 std::string msg = "Error opening file \"";
 msg += filename;
 msg += "\".";
 throw std::runtime_error(msg);
 }
 return file;
 }
};

#endif // !USE_OS_TZDB
namespace arrow_vendored
{
namespace date
Expand DownExpand Up@@ -309,9 +420,9 @@ access_install()
}

void
set_install(const std::string& s)
set_install(const std::string& install)
{
 access_install() = s;
 access_install() = install;
}

static
Expand DownExpand Up@@ -565,15 +676,8 @@ load_timezone_mappings_from_xml_file(const std::string& input_path)
 std::vector<detail::timezone_mapping> mappings;
 std::string line;

 std::ifstream is(input_path);
 if (!is.is_open())
 {
 // We don't emit file exceptions because that's an implementation detail.
 std::string msg = "Error opening time zone mapping file \"";
 msg += input_path;
 msg += "\".";
 throw std::runtime_error(msg);
 }
 file_streambuf ibuf(input_path);
 std::istream is(&ibuf);

 auto error = [&input_path, &line_num](const char* info)
 {
Expand DownExpand Up@@ -703,7 +807,6 @@ load_timezone_mappings_from_xml_file(const std::string& input_path)
 }
 }

 is.close();
 return mappings;
}

Expand DownExpand Up@@ -2675,16 +2778,16 @@ find_read_and_leap_seconds()
 std::getline(in, line);
 if (!line.empty() && line[0] != '#')
 {
 std::istringstream in(line);
in.exceptions(std::ios::failbit | std::ios::badbit);
 std::istringstream iss(line);
iss.exceptions(std::ios::failbit | std::ios::badbit);
 std::string word;
in >> word;
iss >> word;
 if (word == "Leap")
 {
 int y, m, d;
in >> y;
 m = static_cast<int>(parse_month(in));
in >> d;
iss >> y;
 m = static_cast<int>(parse_month(iss));
iss >> d;
 leap_seconds.push_back(leap_second(sys_days{year{y}/m/d} + days{1},
 detail::undocumented{}));
 }
Expand All@@ -2709,11 +2812,11 @@ find_read_and_leap_seconds()
 std::getline(in, line);
 if (!line.empty() && line[0] != '#')
 {
 std::istringstream in(line);
in.exceptions(std::ios::failbit | std::ios::badbit);
 std::istringstream iss(line);
iss.exceptions(std::ios::failbit | std::ios::badbit);
 using seconds = std::chrono::seconds;
 seconds::rep s;
in >> s;
iss >> s;
 if (s == 2272060800)
 continue;
 leap_seconds.push_back(leap_second(sys_seconds{seconds{s}} - offset,
Expand All@@ -2722,6 +2825,7 @@ find_read_and_leap_seconds()
 }
 return leap_seconds;
 }
#if !MISSING_LEAP_SECONDS
 in.clear();
 in.open(get_tz_dir() + std::string(1, folder_delimiter) + "right/UTC",
 std::ios_base::binary);
Expand All@@ -2736,6 +2840,7 @@ find_read_and_leap_seconds()
 {
 return load_just_leaps(in);
 }
#endif
 return {};
}

Expand DownExpand Up@@ -2842,7 +2947,8 @@ bool
file_exists(const std::string& filename)
{
#ifdef _WIN32
 return ::_access(filename.c_str(), 0) == 0;
 std::wstring wfilename = convert_utf8_to_utf16(filename);
 return ::_waccess(wfilename.c_str(), 0) == 0;
#else
 return ::access(filename.c_str(), F_OK) == 0;
#endif
Expand DownExpand Up@@ -3419,16 +3525,27 @@ std::string
get_version(const std::string& path)
{
 std::string version;
 std::ifstream infile(path + "version");
 if (infile.is_open())

 std::string path_version = path + "version";

 if (file_exists(path_version))
 {
 file_streambuf inbuf(path_version);
 std::istream infile(&inbuf);

 infile >> version;

 if (!infile.fail())
 return version;
 }
 else

 std::string path_news = path + "NEWS";

 if (file_exists(path_news))
 {
 infile.open(path + "NEWS");
 file_streambuf inbuf(path_news);
 std::istream infile(&inbuf);

 while (infile)
 {
 infile >> version;
Expand All@@ -3439,6 +3556,7 @@ get_version(const std::string& path)
 }
 }
 }

 throw std::runtime_error("Unable to get Timezone database version from " + path);
}

Expand DownExpand Up@@ -3510,7 +3628,13 @@ init_tzdb()

 for (const auto& filename : files)
 {
 std::ifstream infile(path + filename);
 std::string file_path = path + filename;
 if (!file_exists(file_path))
 {
 continue;
 }
 file_streambuf inbuf(file_path);
 std::istream infile(&inbuf);
 while (infile)
 {
 std::getline(infile, line);
Expand DownExpand Up@@ -3543,6 +3667,10 @@ init_tzdb()
 {
 db->zones.back().add(line);
 }
 else if (word.size() > 0 && word[0] == '#')
 {
 continue;
 }
 else
 {
 std::cerr << line << '\n';
Expand DownExpand Up@@ -3925,7 +4053,7 @@ tzdb::current_zone() const
 auto p = result.find("ZONE=\"");
 if (p != std::string::npos)
 {
 result.erase(p, p+6);
 result.erase(0, p+6);
 result.erase(result.rfind('"'));
 return locate_zone(result);
 }
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@@ -60,7 +60,7 @@
# else
# define HAS_REMOTE_API 1
# endif
# else // HAS_REMOTE_API makes no since when using the OS timezone database
# else // HAS_REMOTE_API makes no sense when using the OS timezone database
# define HAS_REMOTE_API 0
# endif
#endif
Expand DownExpand Up@@ -853,7 +853,7 @@ class time_zone
 load_data(std::istream& inf, std::int32_t tzh_leapcnt, std::int32_t tzh_timecnt,
 std::int32_t tzh_typecnt, std::int32_t tzh_charcnt);
#else // !USE_OS_TZDB
 DATE_API sys_info get_info_impl(sys_seconds tp, int timezone) const;
 DATE_API sys_info get_info_impl(sys_seconds tp, int tz_int) const;
 DATE_API void adjust_infos(const std::vector<detail::Rule>& rules);
 DATE_API void parse_info(std::istream& in);
#endif // !USE_OS_TZDB
Expand Down

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

Skip to content
GH-35594: [R][C++] Bump vendored date library#35612

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

pitrou
merged 3 commits into

from

May 16, 2023
 Merged


GH-35594: [R][C++] Bump vendored date library
#35612
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
fb4465c

Bump vendored version of date to cc4685a21e4a4fdae707ad1233c61bbaff24…


thisisnic May 16, 2023
4f77b9e

Update date.h


thisisnic May 16, 2023
2d79106

Update tz.h


thisisnic May 16, 2023

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 2e19c006e2218447ee31f864191859517603f59f
Sources are taken from changeset cc4685a21e4a4fdae707ad1233c61bbaff241f93
of the above project.

The following changes are made:
Expand Down

6 changes: 3 additions & 3 deletions
cpp/src/arrow/vendored/datetime/date.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1318,7 +1318,7 @@ CONSTCD11
std::chrono::duration<Rep, Period>
abs(std::chrono::duration<Rep, Period> d)
{
 return d >= d.zero() ? d : -d;
 return d >= d.zero() ? d : static_cast<decltype(d)>(-d);
}

// round down
Expand DownExpand Up@@ -4208,8 +4208,8 @@ template <class CharT, class Traits, class Duration>
inline
typename std::enable_if
<
 std::ratio_less<typename Duration::period, days::period>::value
, std::basic_ostream<CharT, Traits>&
!std::is_convertible<Duration, days>::value,
 std::basic_ostream<CharT, Traits>&
>::type
operator<<(std::basic_ostream<CharT, Traits>& os, const sys_time<Duration>& tp)
{
Expand Down

186 changes: 157 additions & 29 deletions
cpp/src/arrow/vendored/datetime/tz.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -202,6 +202,35 @@ namespace
 using co_task_mem_ptr = std::unique_ptr<wchar_t[], task_mem_deleter>;
}

static
std::wstring
convert_utf8_to_utf16(const std::string& s)
{
 std::wstring out;
 const int size = MultiByteToWideChar(CP_UTF8, 0, s.c_str(), -1, NULL, 0);

 if (size == 0)
 {
 std::string msg = "Failed to determine required size when converting \"";
 msg += s;
 msg += "\" to UTF-16.";
 throw std::runtime_error(msg);
 }

 out.resize(size);
 const int check = MultiByteToWideChar(CP_UTF8, 0, s.c_str(), -1, &out[0], size);

 if (size != check)
 {
 std::string msg = "Failed to convert \"";
 msg += s;
 msg += "\" to UTF-16.";
 throw std::runtime_error(msg);
 }

 return out;
}

// We might need to know certain locations even if not using the remote API,
// so keep these routines out of that block for now.
static
Expand DownExpand Up@@ -271,8 +300,90 @@ get_download_folder()

# endif // !_WIN32

#endif // !USE_OS_TZDB
/*
 * This class is provided to mimic the following usage of `ifstream`:
 *
 * std::ifstream is(filename);
 *
 * file_streambuf ibuf(filename);
 * std::istream is(&ibuf);
 *
 * This is required because `ifstream` does not support opening files
 * containing wide characters on Windows. On Windows, `file_streambuf` uses
 * `file_open()` to convert the file name to UTF-16 before opening it with
 * `_wfopen()`.
 *
 * Note that this is not an exact re-implementation of `ifstream`,
 * but is enough for usage here.
 *
 * It is partially based on these two implementations:
 * - fdinbuf from http://www.josuttis.com/cppcode/fdstream.html
 * - stdiobuf https://stackoverflow.com/questions/12342542/convert-file-to-ifstream-c-android-ndk
 *
 * Apparently MSVC provides non-standard overloads of `ifstream` that support
 * a `const wchar_t*` file name, but MinGW does not https://stackoverflow.com/a/822032
 */
class file_streambuf
 : public std::streambuf
{
private:
 FILE* file_;
 static const int buffer_size_ = 1024;
 char buffer_[buffer_size_];

public:
 ~file_streambuf()
 {
 if (file_)
 {
 ::fclose(file_);
 }
 }
 file_streambuf(const file_streambuf&) = delete;
 file_streambuf& operator=(const file_streambuf&) = delete;

 file_streambuf(const std::string& filename)
 : file_(file_open(filename))
 {
 }

protected:
 virtual
 int_type
 underflow()
 {
 if (gptr() == egptr() && file_)
 {
 const size_t size = ::fread(buffer_, 1, buffer_size_, file_);
 setg(buffer_, buffer_, buffer_ + size);
 }
 return (gptr() == egptr())
 ? traits_type::eof()
 : traits_type::to_int_type(*gptr());
 }

private:
 FILE*
 file_open(const std::string& filename)
 {
# ifdef _WIN32
 std::wstring wfilename = convert_utf8_to_utf16(filename);
 FILE* file = ::_wfopen(wfilename.c_str(), L"rb");
# else // !_WIN32
 FILE* file = ::fopen(filename.c_str(), "rb");
# endif // _WIN32
 if (file == NULL)
 {
 std::string msg = "Error opening file \"";
 msg += filename;
 msg += "\".";
 throw std::runtime_error(msg);
 }
 return file;
 }
};

#endif // !USE_OS_TZDB
namespace arrow_vendored
{
namespace date
Expand DownExpand Up@@ -309,9 +420,9 @@ access_install()
}

void
set_install(const std::string& s)
set_install(const std::string& install)
{
 access_install() = s;
 access_install() = install;
}

static
Expand DownExpand Up@@ -565,15 +676,8 @@ load_timezone_mappings_from_xml_file(const std::string& input_path)
 std::vector<detail::timezone_mapping> mappings;
 std::string line;

 std::ifstream is(input_path);
 if (!is.is_open())
 {
 // We don't emit file exceptions because that's an implementation detail.
 std::string msg = "Error opening time zone mapping file \"";
 msg += input_path;
 msg += "\".";
 throw std::runtime_error(msg);
 }
 file_streambuf ibuf(input_path);
 std::istream is(&ibuf);

 auto error = [&input_path, &line_num](const char* info)
 {
Expand DownExpand Up@@ -703,7 +807,6 @@ load_timezone_mappings_from_xml_file(const std::string& input_path)
 }
 }

 is.close();
 return mappings;
}

Expand DownExpand Up@@ -2675,16 +2778,16 @@ find_read_and_leap_seconds()
 std::getline(in, line);
 if (!line.empty() && line[0] != '#')
 {
 std::istringstream in(line);
in.exceptions(std::ios::failbit | std::ios::badbit);
 std::istringstream iss(line);
iss.exceptions(std::ios::failbit | std::ios::badbit);
 std::string word;
in >> word;
iss >> word;
 if (word == "Leap")
 {
 int y, m, d;
in >> y;
 m = static_cast<int>(parse_month(in));
in >> d;
iss >> y;
 m = static_cast<int>(parse_month(iss));
iss >> d;
 leap_seconds.push_back(leap_second(sys_days{year{y}/m/d} + days{1},
 detail::undocumented{}));
 }
Expand All@@ -2709,11 +2812,11 @@ find_read_and_leap_seconds()
 std::getline(in, line);
 if (!line.empty() && line[0] != '#')
 {
 std::istringstream in(line);
in.exceptions(std::ios::failbit | std::ios::badbit);
 std::istringstream iss(line);
iss.exceptions(std::ios::failbit | std::ios::badbit);
 using seconds = std::chrono::seconds;
 seconds::rep s;
in >> s;
iss >> s;
 if (s == 2272060800)
 continue;
 leap_seconds.push_back(leap_second(sys_seconds{seconds{s}} - offset,
Expand All@@ -2722,6 +2825,7 @@ find_read_and_leap_seconds()
 }
 return leap_seconds;
 }
#if !MISSING_LEAP_SECONDS
 in.clear();
 in.open(get_tz_dir() + std::string(1, folder_delimiter) + "right/UTC",
 std::ios_base::binary);
Expand All@@ -2736,6 +2840,7 @@ find_read_and_leap_seconds()
 {
 return load_just_leaps(in);
 }
#endif
 return {};
}

Expand DownExpand Up@@ -2842,7 +2947,8 @@ bool
file_exists(const std::string& filename)
{
#ifdef _WIN32
 return ::_access(filename.c_str(), 0) == 0;
 std::wstring wfilename = convert_utf8_to_utf16(filename);
 return ::_waccess(wfilename.c_str(), 0) == 0;
#else
 return ::access(filename.c_str(), F_OK) == 0;
#endif
Expand DownExpand Up@@ -3419,16 +3525,27 @@ std::string
get_version(const std::string& path)
{
 std::string version;
 std::ifstream infile(path + "version");
 if (infile.is_open())

 std::string path_version = path + "version";

 if (file_exists(path_version))
 {
 file_streambuf inbuf(path_version);
 std::istream infile(&inbuf);

 infile >> version;

 if (!infile.fail())
 return version;
 }
 else

 std::string path_news = path + "NEWS";

 if (file_exists(path_news))
 {
 infile.open(path + "NEWS");
 file_streambuf inbuf(path_news);
 std::istream infile(&inbuf);

 while (infile)
 {
 infile >> version;
Expand All@@ -3439,6 +3556,7 @@ get_version(const std::string& path)
 }
 }
 }

 throw std::runtime_error("Unable to get Timezone database version from " + path);
}

Expand DownExpand Up@@ -3510,7 +3628,13 @@ init_tzdb()

 for (const auto& filename : files)
 {
 std::ifstream infile(path + filename);
 std::string file_path = path + filename;
 if (!file_exists(file_path))
 {
 continue;
 }
 file_streambuf inbuf(file_path);
 std::istream infile(&inbuf);
 while (infile)
 {
 std::getline(infile, line);
Expand DownExpand Up@@ -3543,6 +3667,10 @@ init_tzdb()
 {
 db->zones.back().add(line);
 }
 else if (word.size() > 0 && word[0] == '#')
 {
 continue;
 }
 else
 {
 std::cerr << line << '\n';
Expand DownExpand Up@@ -3925,7 +4053,7 @@ tzdb::current_zone() const
 auto p = result.find("ZONE=\"");
 if (p != std::string::npos)
 {
 result.erase(p, p+6);
 result.erase(0, p+6);
 result.erase(result.rfind('"'));
 return locate_zone(result);
 }
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@@ -60,7 +60,7 @@
# else
# define HAS_REMOTE_API 1
# endif
# else // HAS_REMOTE_API makes no since when using the OS timezone database
# else // HAS_REMOTE_API makes no sense when using the OS timezone database
# define HAS_REMOTE_API 0
# endif
#endif
Expand DownExpand Up@@ -853,7 +853,7 @@ class time_zone
 load_data(std::istream& inf, std::int32_t tzh_leapcnt, std::int32_t tzh_timecnt,
 std::int32_t tzh_typecnt, std::int32_t tzh_charcnt);
#else // !USE_OS_TZDB
 DATE_API sys_info get_info_impl(sys_seconds tp, int timezone) const;
 DATE_API sys_info get_info_impl(sys_seconds tp, int tz_int) const;
 DATE_API void adjust_infos(const std::vector<detail::Rule>& rules);
 DATE_API void parse_info(std::istream& in);
#endif // !USE_OS_TZDB
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} 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-35594: [R][C++] Bump vendored date library#35612

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

pitrou
merged 3 commits into

from

May 16, 2023
 Merged


GH-35594: [R][C++] Bump vendored date library
#35612
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
fb4465c

Bump vendored version of date to cc4685a21e4a4fdae707ad1233c61bbaff24…


thisisnic May 16, 2023
4f77b9e

Update date.h


thisisnic May 16, 2023
2d79106

Update tz.h


thisisnic May 16, 2023

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 2e19c006e2218447ee31f864191859517603f59f
Sources are taken from changeset cc4685a21e4a4fdae707ad1233c61bbaff241f93
of the above project.

The following changes are made:
Expand Down

6 changes: 3 additions & 3 deletions
cpp/src/arrow/vendored/datetime/date.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1318,7 +1318,7 @@ CONSTCD11
std::chrono::duration<Rep, Period>
abs(std::chrono::duration<Rep, Period> d)
{
 return d >= d.zero() ? d : -d;
 return d >= d.zero() ? d : static_cast<decltype(d)>(-d);
}

// round down
Expand DownExpand Up@@ -4208,8 +4208,8 @@ template <class CharT, class Traits, class Duration>
inline
typename std::enable_if
<
 std::ratio_less<typename Duration::period, days::period>::value
, std::basic_ostream<CharT, Traits>&
!std::is_convertible<Duration, days>::value,
 std::basic_ostream<CharT, Traits>&
>::type
operator<<(std::basic_ostream<CharT, Traits>& os, const sys_time<Duration>& tp)
{
Expand Down

186 changes: 157 additions & 29 deletions
cpp/src/arrow/vendored/datetime/tz.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -202,6 +202,35 @@ namespace
 using co_task_mem_ptr = std::unique_ptr<wchar_t[], task_mem_deleter>;
}

static
std::wstring
convert_utf8_to_utf16(const std::string& s)
{
 std::wstring out;
 const int size = MultiByteToWideChar(CP_UTF8, 0, s.c_str(), -1, NULL, 0);

 if (size == 0)
 {
 std::string msg = "Failed to determine required size when converting \"";
 msg += s;
 msg += "\" to UTF-16.";
 throw std::runtime_error(msg);
 }

 out.resize(size);
 const int check = MultiByteToWideChar(CP_UTF8, 0, s.c_str(), -1, &out[0], size);

 if (size != check)
 {
 std::string msg = "Failed to convert \"";
 msg += s;
 msg += "\" to UTF-16.";
 throw std::runtime_error(msg);
 }

 return out;
}

// We might need to know certain locations even if not using the remote API,
// so keep these routines out of that block for now.
static
Expand DownExpand Up@@ -271,8 +300,90 @@ get_download_folder()

# endif // !_WIN32

#endif // !USE_OS_TZDB
/*
 * This class is provided to mimic the following usage of `ifstream`:
 *
 * std::ifstream is(filename);
 *
 * file_streambuf ibuf(filename);
 * std::istream is(&ibuf);
 *
 * This is required because `ifstream` does not support opening files
 * containing wide characters on Windows. On Windows, `file_streambuf` uses
 * `file_open()` to convert the file name to UTF-16 before opening it with
 * `_wfopen()`.
 *
 * Note that this is not an exact re-implementation of `ifstream`,
 * but is enough for usage here.
 *
 * It is partially based on these two implementations:
 * - fdinbuf from http://www.josuttis.com/cppcode/fdstream.html
 * - stdiobuf https://stackoverflow.com/questions/12342542/convert-file-to-ifstream-c-android-ndk
 *
 * Apparently MSVC provides non-standard overloads of `ifstream` that support
 * a `const wchar_t*` file name, but MinGW does not https://stackoverflow.com/a/822032
 */
class file_streambuf
 : public std::streambuf
{
private:
 FILE* file_;
 static const int buffer_size_ = 1024;
 char buffer_[buffer_size_];

public:
 ~file_streambuf()
 {
 if (file_)
 {
 ::fclose(file_);
 }
 }
 file_streambuf(const file_streambuf&) = delete;
 file_streambuf& operator=(const file_streambuf&) = delete;

 file_streambuf(const std::string& filename)
 : file_(file_open(filename))
 {
 }

protected:
 virtual
 int_type
 underflow()
 {
 if (gptr() == egptr() && file_)
 {
 const size_t size = ::fread(buffer_, 1, buffer_size_, file_);
 setg(buffer_, buffer_, buffer_ + size);
 }
 return (gptr() == egptr())
 ? traits_type::eof()
 : traits_type::to_int_type(*gptr());
 }

private:
 FILE*
 file_open(const std::string& filename)
 {
# ifdef _WIN32
 std::wstring wfilename = convert_utf8_to_utf16(filename);
 FILE* file = ::_wfopen(wfilename.c_str(), L"rb");
# else // !_WIN32
 FILE* file = ::fopen(filename.c_str(), "rb");
# endif // _WIN32
 if (file == NULL)
 {
 std::string msg = "Error opening file \"";
 msg += filename;
 msg += "\".";
 throw std::runtime_error(msg);
 }
 return file;
 }
};

#endif // !USE_OS_TZDB
namespace arrow_vendored
{
namespace date
Expand DownExpand Up@@ -309,9 +420,9 @@ access_install()
}

void
set_install(const std::string& s)
set_install(const std::string& install)
{
 access_install() = s;
 access_install() = install;
}

static
Expand DownExpand Up@@ -565,15 +676,8 @@ load_timezone_mappings_from_xml_file(const std::string& input_path)
 std::vector<detail::timezone_mapping> mappings;
 std::string line;

 std::ifstream is(input_path);
 if (!is.is_open())
 {
 // We don't emit file exceptions because that's an implementation detail.
 std::string msg = "Error opening time zone mapping file \"";
 msg += input_path;
 msg += "\".";
 throw std::runtime_error(msg);
 }
 file_streambuf ibuf(input_path);
 std::istream is(&ibuf);

 auto error = [&input_path, &line_num](const char* info)
 {
Expand DownExpand Up@@ -703,7 +807,6 @@ load_timezone_mappings_from_xml_file(const std::string& input_path)
 }
 }

 is.close();
 return mappings;
}

Expand DownExpand Up@@ -2675,16 +2778,16 @@ find_read_and_leap_seconds()
 std::getline(in, line);
 if (!line.empty() && line[0] != '#')
 {
 std::istringstream in(line);
in.exceptions(std::ios::failbit | std::ios::badbit);
 std::istringstream iss(line);
iss.exceptions(std::ios::failbit | std::ios::badbit);
 std::string word;
in >> word;
iss >> word;
 if (word == "Leap")
 {
 int y, m, d;
in >> y;
 m = static_cast<int>(parse_month(in));
in >> d;
iss >> y;
 m = static_cast<int>(parse_month(iss));
iss >> d;
 leap_seconds.push_back(leap_second(sys_days{year{y}/m/d} + days{1},
 detail::undocumented{}));
 }
Expand All@@ -2709,11 +2812,11 @@ find_read_and_leap_seconds()
 std::getline(in, line);
 if (!line.empty() && line[0] != '#')
 {
 std::istringstream in(line);
in.exceptions(std::ios::failbit | std::ios::badbit);
 std::istringstream iss(line);
iss.exceptions(std::ios::failbit | std::ios::badbit);
 using seconds = std::chrono::seconds;
 seconds::rep s;
in >> s;
iss >> s;
 if (s == 2272060800)
 continue;
 leap_seconds.push_back(leap_second(sys_seconds{seconds{s}} - offset,
Expand All@@ -2722,6 +2825,7 @@ find_read_and_leap_seconds()
 }
 return leap_seconds;
 }
#if !MISSING_LEAP_SECONDS
 in.clear();
 in.open(get_tz_dir() + std::string(1, folder_delimiter) + "right/UTC",
 std::ios_base::binary);
Expand All@@ -2736,6 +2840,7 @@ find_read_and_leap_seconds()
 {
 return load_just_leaps(in);
 }
#endif
 return {};
}

Expand DownExpand Up@@ -2842,7 +2947,8 @@ bool
file_exists(const std::string& filename)
{
#ifdef _WIN32
 return ::_access(filename.c_str(), 0) == 0;
 std::wstring wfilename = convert_utf8_to_utf16(filename);
 return ::_waccess(wfilename.c_str(), 0) == 0;
#else
 return ::access(filename.c_str(), F_OK) == 0;
#endif
Expand DownExpand Up@@ -3419,16 +3525,27 @@ std::string
get_version(const std::string& path)
{
 std::string version;
 std::ifstream infile(path + "version");
 if (infile.is_open())

 std::string path_version = path + "version";

 if (file_exists(path_version))
 {
 file_streambuf inbuf(path_version);
 std::istream infile(&inbuf);

 infile >> version;

 if (!infile.fail())
 return version;
 }
 else

 std::string path_news = path + "NEWS";

 if (file_exists(path_news))
 {
 infile.open(path + "NEWS");
 file_streambuf inbuf(path_news);
 std::istream infile(&inbuf);

 while (infile)
 {
 infile >> version;
Expand All@@ -3439,6 +3556,7 @@ get_version(const std::string& path)
 }
 }
 }

 throw std::runtime_error("Unable to get Timezone database version from " + path);
}

Expand DownExpand Up@@ -3510,7 +3628,13 @@ init_tzdb()

 for (const auto& filename : files)
 {
 std::ifstream infile(path + filename);
 std::string file_path = path + filename;
 if (!file_exists(file_path))
 {
 continue;
 }
 file_streambuf inbuf(file_path);
 std::istream infile(&inbuf);
 while (infile)
 {
 std::getline(infile, line);
Expand DownExpand Up@@ -3543,6 +3667,10 @@ init_tzdb()
 {
 db->zones.back().add(line);
 }
 else if (word.size() > 0 && word[0] == '#')
 {
 continue;
 }
 else
 {
 std::cerr << line << '\n';
Expand DownExpand Up@@ -3925,7 +4053,7 @@ tzdb::current_zone() const
 auto p = result.find("ZONE=\"");
 if (p != std::string::npos)
 {
 result.erase(p, p+6);
 result.erase(0, p+6);
 result.erase(result.rfind('"'));
 return locate_zone(result);
 }
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@@ -60,7 +60,7 @@
# else
# define HAS_REMOTE_API 1
# endif
# else // HAS_REMOTE_API makes no since when using the OS timezone database
# else // HAS_REMOTE_API makes no sense when using the OS timezone database
# define HAS_REMOTE_API 0
# endif
#endif
Expand DownExpand Up@@ -853,7 +853,7 @@ class time_zone
 load_data(std::istream& inf, std::int32_t tzh_leapcnt, std::int32_t tzh_timecnt,
 std::int32_t tzh_typecnt, std::int32_t tzh_charcnt);
#else // !USE_OS_TZDB
 DATE_API sys_info get_info_impl(sys_seconds tp, int timezone) const;
 DATE_API sys_info get_info_impl(sys_seconds tp, int tz_int) const;
 DATE_API void adjust_infos(const std::vector<detail::Rule>& rules);
 DATE_API void parse_info(std::istream& in);
#endif // !USE_OS_TZDB
Expand Down

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

Skip to content
GH-35594: [R][C++] Bump vendored date library#35612

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

pitrou
merged 3 commits into

from

May 16, 2023
 Merged


GH-35594: [R][C++] Bump vendored date library
#35612
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
fb4465c

Bump vendored version of date to cc4685a21e4a4fdae707ad1233c61bbaff24…


thisisnic May 16, 2023
4f77b9e

Update date.h


thisisnic May 16, 2023
2d79106

Update tz.h


thisisnic May 16, 2023

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 2e19c006e2218447ee31f864191859517603f59f
Sources are taken from changeset cc4685a21e4a4fdae707ad1233c61bbaff241f93
of the above project.

The following changes are made:
Expand Down

6 changes: 3 additions & 3 deletions
cpp/src/arrow/vendored/datetime/date.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1318,7 +1318,7 @@ CONSTCD11
std::chrono::duration<Rep, Period>
abs(std::chrono::duration<Rep, Period> d)
{
 return d >= d.zero() ? d : -d;
 return d >= d.zero() ? d : static_cast<decltype(d)>(-d);
}

// round down
Expand DownExpand Up@@ -4208,8 +4208,8 @@ template <class CharT, class Traits, class Duration>
inline
typename std::enable_if
<
 std::ratio_less<typename Duration::period, days::period>::value
, std::basic_ostream<CharT, Traits>&
!std::is_convertible<Duration, days>::value,
 std::basic_ostream<CharT, Traits>&
>::type
operator<<(std::basic_ostream<CharT, Traits>& os, const sys_time<Duration>& tp)
{
Expand Down

186 changes: 157 additions & 29 deletions
cpp/src/arrow/vendored/datetime/tz.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -202,6 +202,35 @@ namespace
 using co_task_mem_ptr = std::unique_ptr<wchar_t[], task_mem_deleter>;
}

static
std::wstring
convert_utf8_to_utf16(const std::string& s)
{
 std::wstring out;
 const int size = MultiByteToWideChar(CP_UTF8, 0, s.c_str(), -1, NULL, 0);

 if (size == 0)
 {
 std::string msg = "Failed to determine required size when converting \"";
 msg += s;
 msg += "\" to UTF-16.";
 throw std::runtime_error(msg);
 }

 out.resize(size);
 const int check = MultiByteToWideChar(CP_UTF8, 0, s.c_str(), -1, &out[0], size);

 if (size != check)
 {
 std::string msg = "Failed to convert \"";
 msg += s;
 msg += "\" to UTF-16.";
 throw std::runtime_error(msg);
 }

 return out;
}

// We might need to know certain locations even if not using the remote API,
// so keep these routines out of that block for now.
static
Expand DownExpand Up@@ -271,8 +300,90 @@ get_download_folder()

# endif // !_WIN32

#endif // !USE_OS_TZDB
/*
 * This class is provided to mimic the following usage of `ifstream`:
 *
 * std::ifstream is(filename);
 *
 * file_streambuf ibuf(filename);
 * std::istream is(&ibuf);
 *
 * This is required because `ifstream` does not support opening files
 * containing wide characters on Windows. On Windows, `file_streambuf` uses
 * `file_open()` to convert the file name to UTF-16 before opening it with
 * `_wfopen()`.
 *
 * Note that this is not an exact re-implementation of `ifstream`,
 * but is enough for usage here.
 *
 * It is partially based on these two implementations:
 * - fdinbuf from http://www.josuttis.com/cppcode/fdstream.html
 * - stdiobuf https://stackoverflow.com/questions/12342542/convert-file-to-ifstream-c-android-ndk
 *
 * Apparently MSVC provides non-standard overloads of `ifstream` that support
 * a `const wchar_t*` file name, but MinGW does not https://stackoverflow.com/a/822032
 */
class file_streambuf
 : public std::streambuf
{
private:
 FILE* file_;
 static const int buffer_size_ = 1024;
 char buffer_[buffer_size_];

public:
 ~file_streambuf()
 {
 if (file_)
 {
 ::fclose(file_);
 }
 }
 file_streambuf(const file_streambuf&) = delete;
 file_streambuf& operator=(const file_streambuf&) = delete;

 file_streambuf(const std::string& filename)
 : file_(file_open(filename))
 {
 }

protected:
 virtual
 int_type
 underflow()
 {
 if (gptr() == egptr() && file_)
 {
 const size_t size = ::fread(buffer_, 1, buffer_size_, file_);
 setg(buffer_, buffer_, buffer_ + size);
 }
 return (gptr() == egptr())
 ? traits_type::eof()
 : traits_type::to_int_type(*gptr());
 }

private:
 FILE*
 file_open(const std::string& filename)
 {
# ifdef _WIN32
 std::wstring wfilename = convert_utf8_to_utf16(filename);
 FILE* file = ::_wfopen(wfilename.c_str(), L"rb");
# else // !_WIN32
 FILE* file = ::fopen(filename.c_str(), "rb");
# endif // _WIN32
 if (file == NULL)
 {
 std::string msg = "Error opening file \"";
 msg += filename;
 msg += "\".";
 throw std::runtime_error(msg);
 }
 return file;
 }
};

#endif // !USE_OS_TZDB
namespace arrow_vendored
{
namespace date
Expand DownExpand Up@@ -309,9 +420,9 @@ access_install()
}

void
set_install(const std::string& s)
set_install(const std::string& install)
{
 access_install() = s;
 access_install() = install;
}

static
Expand DownExpand Up@@ -565,15 +676,8 @@ load_timezone_mappings_from_xml_file(const std::string& input_path)
 std::vector<detail::timezone_mapping> mappings;
 std::string line;

 std::ifstream is(input_path);
 if (!is.is_open())
 {
 // We don't emit file exceptions because that's an implementation detail.
 std::string msg = "Error opening time zone mapping file \"";
 msg += input_path;
 msg += "\".";
 throw std::runtime_error(msg);
 }
 file_streambuf ibuf(input_path);
 std::istream is(&ibuf);

 auto error = [&input_path, &line_num](const char* info)
 {
Expand DownExpand Up@@ -703,7 +807,6 @@ load_timezone_mappings_from_xml_file(const std::string& input_path)
 }
 }

 is.close();
 return mappings;
}

Expand DownExpand Up@@ -2675,16 +2778,16 @@ find_read_and_leap_seconds()
 std::getline(in, line);
 if (!line.empty() && line[0] != '#')
 {
 std::istringstream in(line);
in.exceptions(std::ios::failbit | std::ios::badbit);
 std::istringstream iss(line);
iss.exceptions(std::ios::failbit | std::ios::badbit);
 std::string word;
in >> word;
iss >> word;
 if (word == "Leap")
 {
 int y, m, d;
in >> y;
 m = static_cast<int>(parse_month(in));
in >> d;
iss >> y;
 m = static_cast<int>(parse_month(iss));
iss >> d;
 leap_seconds.push_back(leap_second(sys_days{year{y}/m/d} + days{1},
 detail::undocumented{}));
 }
Expand All@@ -2709,11 +2812,11 @@ find_read_and_leap_seconds()
 std::getline(in, line);
 if (!line.empty() && line[0] != '#')
 {
 std::istringstream in(line);
in.exceptions(std::ios::failbit | std::ios::badbit);
 std::istringstream iss(line);
iss.exceptions(std::ios::failbit | std::ios::badbit);
 using seconds = std::chrono::seconds;
 seconds::rep s;
in >> s;
iss >> s;
 if (s == 2272060800)
 continue;
 leap_seconds.push_back(leap_second(sys_seconds{seconds{s}} - offset,
Expand All@@ -2722,6 +2825,7 @@ find_read_and_leap_seconds()
 }
 return leap_seconds;
 }
#if !MISSING_LEAP_SECONDS
 in.clear();
 in.open(get_tz_dir() + std::string(1, folder_delimiter) + "right/UTC",
 std::ios_base::binary);
Expand All@@ -2736,6 +2840,7 @@ find_read_and_leap_seconds()
 {
 return load_just_leaps(in);
 }
#endif
 return {};
}

Expand DownExpand Up@@ -2842,7 +2947,8 @@ bool
file_exists(const std::string& filename)
{
#ifdef _WIN32
 return ::_access(filename.c_str(), 0) == 0;
 std::wstring wfilename = convert_utf8_to_utf16(filename);
 return ::_waccess(wfilename.c_str(), 0) == 0;
#else
 return ::access(filename.c_str(), F_OK) == 0;
#endif
Expand DownExpand Up@@ -3419,16 +3525,27 @@ std::string
get_version(const std::string& path)
{
 std::string version;
 std::ifstream infile(path + "version");
 if (infile.is_open())

 std::string path_version = path + "version";

 if (file_exists(path_version))
 {
 file_streambuf inbuf(path_version);
 std::istream infile(&inbuf);

 infile >> version;

 if (!infile.fail())
 return version;
 }
 else

 std::string path_news = path + "NEWS";

 if (file_exists(path_news))
 {
 infile.open(path + "NEWS");
 file_streambuf inbuf(path_news);
 std::istream infile(&inbuf);

 while (infile)
 {
 infile >> version;
Expand All@@ -3439,6 +3556,7 @@ get_version(const std::string& path)
 }
 }
 }

 throw std::runtime_error("Unable to get Timezone database version from " + path);
}

Expand DownExpand Up@@ -3510,7 +3628,13 @@ init_tzdb()

 for (const auto& filename : files)
 {
 std::ifstream infile(path + filename);
 std::string file_path = path + filename;
 if (!file_exists(file_path))
 {
 continue;
 }
 file_streambuf inbuf(file_path);
 std::istream infile(&inbuf);
 while (infile)
 {
 std::getline(infile, line);
Expand DownExpand Up@@ -3543,6 +3667,10 @@ init_tzdb()
 {
 db->zones.back().add(line);
 }
 else if (word.size() > 0 && word[0] == '#')
 {
 continue;
 }
 else
 {
 std::cerr << line << '\n';
Expand DownExpand Up@@ -3925,7 +4053,7 @@ tzdb::current_zone() const
 auto p = result.find("ZONE=\"");
 if (p != std::string::npos)
 {
 result.erase(p, p+6);
 result.erase(0, p+6);
 result.erase(result.rfind('"'));
 return locate_zone(result);
 }
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@@ -60,7 +60,7 @@
# else
# define HAS_REMOTE_API 1
# endif
# else // HAS_REMOTE_API makes no since when using the OS timezone database
# else // HAS_REMOTE_API makes no sense when using the OS timezone database
# define HAS_REMOTE_API 0
# endif
#endif
Expand DownExpand Up@@ -853,7 +853,7 @@ class time_zone
 load_data(std::istream& inf, std::int32_t tzh_leapcnt, std::int32_t tzh_timecnt,
 std::int32_t tzh_typecnt, std::int32_t tzh_charcnt);
#else // !USE_OS_TZDB
 DATE_API sys_info get_info_impl(sys_seconds tp, int timezone) const;
 DATE_API sys_info get_info_impl(sys_seconds tp, int tz_int) const;
 DATE_API void adjust_infos(const std::vector<detail::Rule>& rules);
 DATE_API void parse_info(std::istream& in);
#endif // !USE_OS_TZDB
Expand Down

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

Skip to content
GH-35594: [R][C++] Bump vendored date library#35612

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

pitrou
merged 3 commits into

from

May 16, 2023
 Merged


GH-35594: [R][C++] Bump vendored date library
#35612
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
fb4465c

Bump vendored version of date to cc4685a21e4a4fdae707ad1233c61bbaff24…


thisisnic May 16, 2023
4f77b9e

Update date.h


thisisnic May 16, 2023
2d79106

Update tz.h


thisisnic May 16, 2023

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 2e19c006e2218447ee31f864191859517603f59f
Sources are taken from changeset cc4685a21e4a4fdae707ad1233c61bbaff241f93
of the above project.

The following changes are made:
Expand Down

6 changes: 3 additions & 3 deletions
cpp/src/arrow/vendored/datetime/date.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1318,7 +1318,7 @@ CONSTCD11
std::chrono::duration<Rep, Period>
abs(std::chrono::duration<Rep, Period> d)
{
 return d >= d.zero() ? d : -d;
 return d >= d.zero() ? d : static_cast<decltype(d)>(-d);
}

// round down
Expand DownExpand Up@@ -4208,8 +4208,8 @@ template <class CharT, class Traits, class Duration>
inline
typename std::enable_if
<
 std::ratio_less<typename Duration::period, days::period>::value
, std::basic_ostream<CharT, Traits>&
!std::is_convertible<Duration, days>::value,
 std::basic_ostream<CharT, Traits>&
>::type
operator<<(std::basic_ostream<CharT, Traits>& os, const sys_time<Duration>& tp)
{
Expand Down

186 changes: 157 additions & 29 deletions
cpp/src/arrow/vendored/datetime/tz.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -202,6 +202,35 @@ namespace
 using co_task_mem_ptr = std::unique_ptr<wchar_t[], task_mem_deleter>;
}

static
std::wstring
convert_utf8_to_utf16(const std::string& s)
{
 std::wstring out;
 const int size = MultiByteToWideChar(CP_UTF8, 0, s.c_str(), -1, NULL, 0);

 if (size == 0)
 {
 std::string msg = "Failed to determine required size when converting \"";
 msg += s;
 msg += "\" to UTF-16.";
 throw std::runtime_error(msg);
 }

 out.resize(size);
 const int check = MultiByteToWideChar(CP_UTF8, 0, s.c_str(), -1, &out[0], size);

 if (size != check)
 {
 std::string msg = "Failed to convert \"";
 msg += s;
 msg += "\" to UTF-16.";
 throw std::runtime_error(msg);
 }

 return out;
}

// We might need to know certain locations even if not using the remote API,
// so keep these routines out of that block for now.
static
Expand DownExpand Up@@ -271,8 +300,90 @@ get_download_folder()

# endif // !_WIN32

#endif // !USE_OS_TZDB
/*
 * This class is provided to mimic the following usage of `ifstream`:
 *
 * std::ifstream is(filename);
 *
 * file_streambuf ibuf(filename);
 * std::istream is(&ibuf);
 *
 * This is required because `ifstream` does not support opening files
 * containing wide characters on Windows. On Windows, `file_streambuf` uses
 * `file_open()` to convert the file name to UTF-16 before opening it with
 * `_wfopen()`.
 *
 * Note that this is not an exact re-implementation of `ifstream`,
 * but is enough for usage here.
 *
 * It is partially based on these two implementations:
 * - fdinbuf from http://www.josuttis.com/cppcode/fdstream.html
 * - stdiobuf https://stackoverflow.com/questions/12342542/convert-file-to-ifstream-c-android-ndk
 *
 * Apparently MSVC provides non-standard overloads of `ifstream` that support
 * a `const wchar_t*` file name, but MinGW does not https://stackoverflow.com/a/822032
 */
class file_streambuf
 : public std::streambuf
{
private:
 FILE* file_;
 static const int buffer_size_ = 1024;
 char buffer_[buffer_size_];

public:
 ~file_streambuf()
 {
 if (file_)
 {
 ::fclose(file_);
 }
 }
 file_streambuf(const file_streambuf&) = delete;
 file_streambuf& operator=(const file_streambuf&) = delete;

 file_streambuf(const std::string& filename)
 : file_(file_open(filename))
 {
 }

protected:
 virtual
 int_type
 underflow()
 {
 if (gptr() == egptr() && file_)
 {
 const size_t size = ::fread(buffer_, 1, buffer_size_, file_);
 setg(buffer_, buffer_, buffer_ + size);
 }
 return (gptr() == egptr())
 ? traits_type::eof()
 : traits_type::to_int_type(*gptr());
 }

private:
 FILE*
 file_open(const std::string& filename)
 {
# ifdef _WIN32
 std::wstring wfilename = convert_utf8_to_utf16(filename);
 FILE* file = ::_wfopen(wfilename.c_str(), L"rb");
# else // !_WIN32
 FILE* file = ::fopen(filename.c_str(), "rb");
# endif // _WIN32
 if (file == NULL)
 {
 std::string msg = "Error opening file \"";
 msg += filename;
 msg += "\".";
 throw std::runtime_error(msg);
 }
 return file;
 }
};

#endif // !USE_OS_TZDB
namespace arrow_vendored
{
namespace date
Expand DownExpand Up@@ -309,9 +420,9 @@ access_install()
}

void
set_install(const std::string& s)
set_install(const std::string& install)
{
 access_install() = s;
 access_install() = install;
}

static
Expand DownExpand Up@@ -565,15 +676,8 @@ load_timezone_mappings_from_xml_file(const std::string& input_path)
 std::vector<detail::timezone_mapping> mappings;
 std::string line;

 std::ifstream is(input_path);
 if (!is.is_open())
 {
 // We don't emit file exceptions because that's an implementation detail.
 std::string msg = "Error opening time zone mapping file \"";
 msg += input_path;
 msg += "\".";
 throw std::runtime_error(msg);
 }
 file_streambuf ibuf(input_path);
 std::istream is(&ibuf);

 auto error = [&input_path, &line_num](const char* info)
 {
Expand DownExpand Up@@ -703,7 +807,6 @@ load_timezone_mappings_from_xml_file(const std::string& input_path)
 }
 }

 is.close();
 return mappings;
}

Expand DownExpand Up@@ -2675,16 +2778,16 @@ find_read_and_leap_seconds()
 std::getline(in, line);
 if (!line.empty() && line[0] != '#')
 {
 std::istringstream in(line);
in.exceptions(std::ios::failbit | std::ios::badbit);
 std::istringstream iss(line);
iss.exceptions(std::ios::failbit | std::ios::badbit);
 std::string word;
in >> word;
iss >> word;
 if (word == "Leap")
 {
 int y, m, d;
in >> y;
 m = static_cast<int>(parse_month(in));
in >> d;
iss >> y;
 m = static_cast<int>(parse_month(iss));
iss >> d;
 leap_seconds.push_back(leap_second(sys_days{year{y}/m/d} + days{1},
 detail::undocumented{}));
 }
Expand All@@ -2709,11 +2812,11 @@ find_read_and_leap_seconds()
 std::getline(in, line);
 if (!line.empty() && line[0] != '#')
 {
 std::istringstream in(line);
in.exceptions(std::ios::failbit | std::ios::badbit);
 std::istringstream iss(line);
iss.exceptions(std::ios::failbit | std::ios::badbit);
 using seconds = std::chrono::seconds;
 seconds::rep s;
in >> s;
iss >> s;
 if (s == 2272060800)
 continue;
 leap_seconds.push_back(leap_second(sys_seconds{seconds{s}} - offset,
Expand All@@ -2722,6 +2825,7 @@ find_read_and_leap_seconds()
 }
 return leap_seconds;
 }
#if !MISSING_LEAP_SECONDS
 in.clear();
 in.open(get_tz_dir() + std::string(1, folder_delimiter) + "right/UTC",
 std::ios_base::binary);
Expand All@@ -2736,6 +2840,7 @@ find_read_and_leap_seconds()
 {
 return load_just_leaps(in);
 }
#endif
 return {};
}

Expand DownExpand Up@@ -2842,7 +2947,8 @@ bool
file_exists(const std::string& filename)
{
#ifdef _WIN32
 return ::_access(filename.c_str(), 0) == 0;
 std::wstring wfilename = convert_utf8_to_utf16(filename);
 return ::_waccess(wfilename.c_str(), 0) == 0;
#else
 return ::access(filename.c_str(), F_OK) == 0;
#endif
Expand DownExpand Up@@ -3419,16 +3525,27 @@ std::string
get_version(const std::string& path)
{
 std::string version;
 std::ifstream infile(path + "version");
 if (infile.is_open())

 std::string path_version = path + "version";

 if (file_exists(path_version))
 {
 file_streambuf inbuf(path_version);
 std::istream infile(&inbuf);

 infile >> version;

 if (!infile.fail())
 return version;
 }
 else

 std::string path_news = path + "NEWS";

 if (file_exists(path_news))
 {
 infile.open(path + "NEWS");
 file_streambuf inbuf(path_news);
 std::istream infile(&inbuf);

 while (infile)
 {
 infile >> version;
Expand All@@ -3439,6 +3556,7 @@ get_version(const std::string& path)
 }
 }
 }

 throw std::runtime_error("Unable to get Timezone database version from " + path);
}

Expand DownExpand Up@@ -3510,7 +3628,13 @@ init_tzdb()

 for (const auto& filename : files)
 {
 std::ifstream infile(path + filename);
 std::string file_path = path + filename;
 if (!file_exists(file_path))
 {
 continue;
 }
 file_streambuf inbuf(file_path);
 std::istream infile(&inbuf);
 while (infile)
 {
 std::getline(infile, line);
Expand DownExpand Up@@ -3543,6 +3667,10 @@ init_tzdb()
 {
 db->zones.back().add(line);
 }
 else if (word.size() > 0 && word[0] == '#')
 {
 continue;
 }
 else
 {
 std::cerr << line << '\n';
Expand DownExpand Up@@ -3925,7 +4053,7 @@ tzdb::current_zone() const
 auto p = result.find("ZONE=\"");
 if (p != std::string::npos)
 {
 result.erase(p, p+6);
 result.erase(0, p+6);
 result.erase(result.rfind('"'));
 return locate_zone(result);
 }
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@@ -60,7 +60,7 @@
# else
# define HAS_REMOTE_API 1
# endif
# else // HAS_REMOTE_API makes no since when using the OS timezone database
# else // HAS_REMOTE_API makes no sense when using the OS timezone database
# define HAS_REMOTE_API 0
# endif
#endif
Expand DownExpand Up@@ -853,7 +853,7 @@ class time_zone
 load_data(std::istream& inf, std::int32_t tzh_leapcnt, std::int32_t tzh_timecnt,
 std::int32_t tzh_typecnt, std::int32_t tzh_charcnt);
#else // !USE_OS_TZDB
 DATE_API sys_info get_info_impl(sys_seconds tp, int timezone) const;
 DATE_API sys_info get_info_impl(sys_seconds tp, int tz_int) const;
 DATE_API void adjust_infos(const std::vector<detail::Rule>& rules);
 DATE_API void parse_info(std::istream& in);
#endif // !USE_OS_TZDB
Expand Down

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

Skip to content
GH-35594: [R][C++] Bump vendored date library#35612

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

pitrou
merged 3 commits into

from

May 16, 2023
 Merged


GH-35594: [R][C++] Bump vendored date library
#35612
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
fb4465c

Bump vendored version of date to cc4685a21e4a4fdae707ad1233c61bbaff24…


thisisnic May 16, 2023
4f77b9e

Update date.h


thisisnic May 16, 2023
2d79106

Update tz.h


thisisnic May 16, 2023

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 2e19c006e2218447ee31f864191859517603f59f
Sources are taken from changeset cc4685a21e4a4fdae707ad1233c61bbaff241f93
of the above project.

The following changes are made:
Expand Down

6 changes: 3 additions & 3 deletions
cpp/src/arrow/vendored/datetime/date.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1318,7 +1318,7 @@ CONSTCD11
std::chrono::duration<Rep, Period>
abs(std::chrono::duration<Rep, Period> d)
{
 return d >= d.zero() ? d : -d;
 return d >= d.zero() ? d : static_cast<decltype(d)>(-d);
}

// round down
Expand DownExpand Up@@ -4208,8 +4208,8 @@ template <class CharT, class Traits, class Duration>
inline
typename std::enable_if
<
 std::ratio_less<typename Duration::period, days::period>::value
, std::basic_ostream<CharT, Traits>&
!std::is_convertible<Duration, days>::value,
 std::basic_ostream<CharT, Traits>&
>::type
operator<<(std::basic_ostream<CharT, Traits>& os, const sys_time<Duration>& tp)
{
Expand Down

186 changes: 157 additions & 29 deletions
cpp/src/arrow/vendored/datetime/tz.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -202,6 +202,35 @@ namespace
 using co_task_mem_ptr = std::unique_ptr<wchar_t[], task_mem_deleter>;
}

static
std::wstring
convert_utf8_to_utf16(const std::string& s)
{
 std::wstring out;
 const int size = MultiByteToWideChar(CP_UTF8, 0, s.c_str(), -1, NULL, 0);

 if (size == 0)
 {
 std::string msg = "Failed to determine required size when converting \"";
 msg += s;
 msg += "\" to UTF-16.";
 throw std::runtime_error(msg);
 }

 out.resize(size);
 const int check = MultiByteToWideChar(CP_UTF8, 0, s.c_str(), -1, &out[0], size);

 if (size != check)
 {
 std::string msg = "Failed to convert \"";
 msg += s;
 msg += "\" to UTF-16.";
 throw std::runtime_error(msg);
 }

 return out;
}

// We might need to know certain locations even if not using the remote API,
// so keep these routines out of that block for now.
static
Expand DownExpand Up@@ -271,8 +300,90 @@ get_download_folder()

# endif // !_WIN32

#endif // !USE_OS_TZDB
/*
 * This class is provided to mimic the following usage of `ifstream`:
 *
 * std::ifstream is(filename);
 *
 * file_streambuf ibuf(filename);
 * std::istream is(&ibuf);
 *
 * This is required because `ifstream` does not support opening files
 * containing wide characters on Windows. On Windows, `file_streambuf` uses
 * `file_open()` to convert the file name to UTF-16 before opening it with
 * `_wfopen()`.
 *
 * Note that this is not an exact re-implementation of `ifstream`,
 * but is enough for usage here.
 *
 * It is partially based on these two implementations:
 * - fdinbuf from http://www.josuttis.com/cppcode/fdstream.html
 * - stdiobuf https://stackoverflow.com/questions/12342542/convert-file-to-ifstream-c-android-ndk
 *
 * Apparently MSVC provides non-standard overloads of `ifstream` that support
 * a `const wchar_t*` file name, but MinGW does not https://stackoverflow.com/a/822032
 */
class file_streambuf
 : public std::streambuf
{
private:
 FILE* file_;
 static const int buffer_size_ = 1024;
 char buffer_[buffer_size_];

public:
 ~file_streambuf()
 {
 if (file_)
 {
 ::fclose(file_);
 }
 }
 file_streambuf(const file_streambuf&) = delete;
 file_streambuf& operator=(const file_streambuf&) = delete;

 file_streambuf(const std::string& filename)
 : file_(file_open(filename))
 {
 }

protected:
 virtual
 int_type
 underflow()
 {
 if (gptr() == egptr() && file_)
 {
 const size_t size = ::fread(buffer_, 1, buffer_size_, file_);
 setg(buffer_, buffer_, buffer_ + size);
 }
 return (gptr() == egptr())
 ? traits_type::eof()
 : traits_type::to_int_type(*gptr());
 }

private:
 FILE*
 file_open(const std::string& filename)
 {
# ifdef _WIN32
 std::wstring wfilename = convert_utf8_to_utf16(filename);
 FILE* file = ::_wfopen(wfilename.c_str(), L"rb");
# else // !_WIN32
 FILE* file = ::fopen(filename.c_str(), "rb");
# endif // _WIN32
 if (file == NULL)
 {
 std::string msg = "Error opening file \"";
 msg += filename;
 msg += "\".";
 throw std::runtime_error(msg);
 }
 return file;
 }
};

#endif // !USE_OS_TZDB
namespace arrow_vendored
{
namespace date
Expand DownExpand Up@@ -309,9 +420,9 @@ access_install()
}

void
set_install(const std::string& s)
set_install(const std::string& install)
{
 access_install() = s;
 access_install() = install;
}

static
Expand DownExpand Up@@ -565,15 +676,8 @@ load_timezone_mappings_from_xml_file(const std::string& input_path)
 std::vector<detail::timezone_mapping> mappings;
 std::string line;

 std::ifstream is(input_path);
 if (!is.is_open())
 {
 // We don't emit file exceptions because that's an implementation detail.
 std::string msg = "Error opening time zone mapping file \"";
 msg += input_path;
 msg += "\".";
 throw std::runtime_error(msg);
 }
 file_streambuf ibuf(input_path);
 std::istream is(&ibuf);

 auto error = [&input_path, &line_num](const char* info)
 {
Expand DownExpand Up@@ -703,7 +807,6 @@ load_timezone_mappings_from_xml_file(const std::string& input_path)
 }
 }

 is.close();
 return mappings;
}

Expand DownExpand Up@@ -2675,16 +2778,16 @@ find_read_and_leap_seconds()
 std::getline(in, line);
 if (!line.empty() && line[0] != '#')
 {
 std::istringstream in(line);
in.exceptions(std::ios::failbit | std::ios::badbit);
 std::istringstream iss(line);
iss.exceptions(std::ios::failbit | std::ios::badbit);
 std::string word;
in >> word;
iss >> word;
 if (word == "Leap")
 {
 int y, m, d;
in >> y;
 m = static_cast<int>(parse_month(in));
in >> d;
iss >> y;
 m = static_cast<int>(parse_month(iss));
iss >> d;
 leap_seconds.push_back(leap_second(sys_days{year{y}/m/d} + days{1},
 detail::undocumented{}));
 }
Expand All@@ -2709,11 +2812,11 @@ find_read_and_leap_seconds()
 std::getline(in, line);
 if (!line.empty() && line[0] != '#')
 {
 std::istringstream in(line);
in.exceptions(std::ios::failbit | std::ios::badbit);
 std::istringstream iss(line);
iss.exceptions(std::ios::failbit | std::ios::badbit);
 using seconds = std::chrono::seconds;
 seconds::rep s;
in >> s;
iss >> s;
 if (s == 2272060800)
 continue;
 leap_seconds.push_back(leap_second(sys_seconds{seconds{s}} - offset,
Expand All@@ -2722,6 +2825,7 @@ find_read_and_leap_seconds()
 }
 return leap_seconds;
 }
#if !MISSING_LEAP_SECONDS
 in.clear();
 in.open(get_tz_dir() + std::string(1, folder_delimiter) + "right/UTC",
 std::ios_base::binary);
Expand All@@ -2736,6 +2840,7 @@ find_read_and_leap_seconds()
 {
 return load_just_leaps(in);
 }
#endif
 return {};
}

Expand DownExpand Up@@ -2842,7 +2947,8 @@ bool
file_exists(const std::string& filename)
{
#ifdef _WIN32
 return ::_access(filename.c_str(), 0) == 0;
 std::wstring wfilename = convert_utf8_to_utf16(filename);
 return ::_waccess(wfilename.c_str(), 0) == 0;
#else
 return ::access(filename.c_str(), F_OK) == 0;
#endif
Expand DownExpand Up@@ -3419,16 +3525,27 @@ std::string
get_version(const std::string& path)
{
 std::string version;
 std::ifstream infile(path + "version");
 if (infile.is_open())

 std::string path_version = path + "version";

 if (file_exists(path_version))
 {
 file_streambuf inbuf(path_version);
 std::istream infile(&inbuf);

 infile >> version;

 if (!infile.fail())
 return version;
 }
 else

 std::string path_news = path + "NEWS";

 if (file_exists(path_news))
 {
 infile.open(path + "NEWS");
 file_streambuf inbuf(path_news);
 std::istream infile(&inbuf);

 while (infile)
 {
 infile >> version;
Expand All@@ -3439,6 +3556,7 @@ get_version(const std::string& path)
 }
 }
 }

 throw std::runtime_error("Unable to get Timezone database version from " + path);
}

Expand DownExpand Up@@ -3510,7 +3628,13 @@ init_tzdb()

 for (const auto& filename : files)
 {
 std::ifstream infile(path + filename);
 std::string file_path = path + filename;
 if (!file_exists(file_path))
 {
 continue;
 }
 file_streambuf inbuf(file_path);
 std::istream infile(&inbuf);
 while (infile)
 {
 std::getline(infile, line);
Expand DownExpand Up@@ -3543,6 +3667,10 @@ init_tzdb()
 {
 db->zones.back().add(line);
 }
 else if (word.size() > 0 && word[0] == '#')
 {
 continue;
 }
 else
 {
 std::cerr << line << '\n';
Expand DownExpand Up@@ -3925,7 +4053,7 @@ tzdb::current_zone() const
 auto p = result.find("ZONE=\"");
 if (p != std::string::npos)
 {
 result.erase(p, p+6);
 result.erase(0, p+6);
 result.erase(result.rfind('"'));
 return locate_zone(result);
 }
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@@ -60,7 +60,7 @@
# else
# define HAS_REMOTE_API 1
# endif
# else // HAS_REMOTE_API makes no since when using the OS timezone database
# else // HAS_REMOTE_API makes no sense when using the OS timezone database
# define HAS_REMOTE_API 0
# endif
#endif
Expand DownExpand Up@@ -853,7 +853,7 @@ class time_zone
 load_data(std::istream& inf, std::int32_t tzh_leapcnt, std::int32_t tzh_timecnt,
 std::int32_t tzh_typecnt, std::int32_t tzh_charcnt);
#else // !USE_OS_TZDB
 DATE_API sys_info get_info_impl(sys_seconds tp, int timezone) const;
 DATE_API sys_info get_info_impl(sys_seconds tp, int tz_int) const;
 DATE_API void adjust_infos(const std::vector<detail::Rule>& rules);
 DATE_API void parse_info(std::istream& in);
#endif // !USE_OS_TZDB
Expand Down