Reverting more changes

rok · rok · commit 826f19696157 · 2026-01-07T19:37:20.000+01:00
diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml
@@ -370,7 +370,8 @@ jobs:
         if: matrix.msystem_upper == 'CLANG64'
         shell: bash
         run: |
-          # TODO(GH-48743): Clang64 uses vendored date library which needs tzdata
+          # TODO(GH-48743): msys2 clang64 uses libc++ and vendored date.h library
+          # which needs tzdata database to build Arrow with time zone support.
           # https://github.com/apache/arrow/issues/48743
           ci/scripts/download_tz_database.sh
       - name: Download MinIO
diff --git a/cpp/src/arrow/config.cc b/cpp/src/arrow/config.cc
@@ -64,8 +64,6 @@ std::string MakeSimdLevelString(QueryFlagFunction&& query_flag) {
   }
 }
 
-// TODO(GH-48593): Remove when libc++ supports std::chrono timezone
-// https://github.com/apache/arrow/issues/48593
 std::optional<std::string> timezone_db_path;
 
 };  // namespace
@@ -88,8 +86,8 @@ RuntimeInfo GetRuntimeInfo() {
   return info;
 }
 
-// TODO(GH-48743): Remove when RTools upgrades to GCC with std::chrono timezone support
-// https://github.com/apache/arrow/issues/48743
+// TODO(GH-48743): Remove when RTools upgrades to libstdc++ with std::chrono timezone
+// support https://github.com/apache/arrow/issues/48743
 Status Initialize(const GlobalOptions& options) noexcept {
   if (options.timezone_db_path.has_value()) {
 #if !USE_OS_TZDB
diff --git a/cpp/src/arrow/config.h b/cpp/src/arrow/config.h
@@ -67,13 +67,9 @@ struct RuntimeInfo {
 
   /// Whether using the OS-based timezone database
   /// This is set at compile-time.
-  // ARROW_DEPRECATED("Deprecated in 23.0.0")
   bool using_os_timezone_db;
 
   /// The path to the timezone database; by default None.
-  /// This is only used on some Windows builds where
-  /// std::chrono timezone support is not available.
-  // ARROW_DEPRECATED("Deprecated in 23.0.0")
   std::optional<std::string> timezone_db_path;
 };
 
@@ -90,18 +86,12 @@ const BuildInfo& GetBuildInfo();
 ARROW_EXPORT
 RuntimeInfo GetRuntimeInfo();
 
-// TODO(GH-48743): Remove when RTools upgrades to GCC with std::chrono timezone support
-// https://github.com/apache/arrow/issues/48743
 struct GlobalOptions {
-  /// The path to the timezone database; by default None.
-  /// This is only used on some Windows builds where
-  /// std::chrono timezone support is not available.
-  // ARROW_DEPRECATED("Deprecated in 23.0.0")
+  /// Path to text timezone database. This is only configurable on Windows,
+  /// which does not have a compatible OS timezone database.
   std::optional<std::string> timezone_db_path;
 };
 
-// TODO(GH-48743): Remove when RTools upgrades to GCC with std::chrono timezone support
-// https://github.com/apache/arrow/issues/48743
 ARROW_EXPORT
 Status Initialize(const GlobalOptions& options) noexcept;
 
diff --git a/cpp/src/arrow/public_api_test.cc b/cpp/src/arrow/public_api_test.cc
@@ -122,8 +122,6 @@ TEST(Misc, BuildInfo) {
   ASSERT_THAT(info.full_so_version, ::testing::HasSubstr(info.so_version));
 }
 
-// TODO(GH-48593): Remove when libc++ supports std::chrono timezone
-// https://github.com/apache/arrow/issues/48593
 TEST(Misc, SetTimezoneConfig) {
 #ifndef _WIN32
   GTEST_SKIP() << "Can only set the Timezone database on Windows";
diff --git a/cpp/src/arrow/testing/util.cc b/cpp/src/arrow/testing/util.cc
@@ -122,7 +122,7 @@ Status GetTestResourceRoot(std::string* out) {
   return Status::OK();
 }
 
-// TODO(GH-48593): Remove when libc++ supports std::chrono timezone
+// TODO(GH-48593): Remove when we have full std::chrono support
 // https://github.com/apache/arrow/issues/48593
 std::optional<std::string> GetTestTimezoneDatabaseRoot() {
   const char* c_root = std::getenv("ARROW_TIMEZONE_DATABASE");
@@ -132,7 +132,7 @@ std::optional<std::string> GetTestTimezoneDatabaseRoot() {
   return std::make_optional(std::string(c_root));
 }
 
-// TODO(GH-48593): Remove when libc++ supports std::chrono timezone
+// TODO(GH-48593): Remove when we have full std::chrono support
 // https://github.com/apache/arrow/issues/48593
 Status InitTestTimezoneDatabase() {
   auto maybe_tzdata = GetTestTimezoneDatabaseRoot();
diff --git a/cpp/src/arrow/testing/util.h b/cpp/src/arrow/testing/util.h
@@ -112,12 +112,12 @@ UnionTypeFactories() {
 // Status
 ARROW_TESTING_EXPORT Status GetTestResourceRoot(std::string*);
 
-// TODO(GH-48593): Remove when libc++ supports std::chrono timezone
+// TODO(GH-48593): Remove when we have full std::chrono support
 // https://github.com/apache/arrow/issues/48593
 // Return the value of the ARROW_TIMEZONE_DATABASE environment variable
 ARROW_TESTING_EXPORT std::optional<std::string> GetTestTimezoneDatabaseRoot();
 
-// TODO(GH-48593): Remove when libc++ supports std::chrono timezone
+// TODO(GH-48593): Remove when we have full std::chrono support
 // https://github.com/apache/arrow/issues/48593
 // Set the Timezone database based on the ARROW_TIMEZONE_DATABASE env variable
 // This is only relevant on Windows, since other OSs have compatible databases built-in
diff --git a/docs/source/cpp/build_system.rst b/docs/source/cpp/build_system.rst
@@ -235,9 +235,6 @@ will manage consistent versions of Arrow and its dependencies.
 Runtime Dependencies
 ====================
 
-.. TODO(GH-48593): Remove when libc++ supports std::chrono timezone
-   https://github.com/apache/arrow/issues/48593
-
 While Arrow uses the OS-provided timezone database on Linux and macOS, it
 requires a user-provided database on Windows. You must download and extract the
 text version of the IANA timezone database and add the Windows timezone mapping
diff --git a/docs/source/developers/cpp/windows.rst b/docs/source/developers/cpp/windows.rst
@@ -384,9 +384,6 @@ be defined, and similarly for ``-DARROW_FLIGHT_SQL=ON``.
 Downloading the Timezone Database
 =================================
 
-.. TODO(GH-48593): Remove when libc++ supports std::chrono timezone
-   https://github.com/apache/arrow/issues/48593
-
 To run some of the compute unit tests on Windows, the IANA timezone database
 and the Windows timezone mapping need to be downloaded first. See
 :ref:`download-timezone-database` for download instructions. To set a non-default
diff --git a/docs/source/python/install.rst b/docs/source/python/install.rst
@@ -83,9 +83,6 @@ and **pytz**, **dateutil** or **tzdata** package for timezones.
 tzdata on Windows
 ^^^^^^^^^^^^^^^^^
 
-.. TODO(GH-48593): Remove when libc++ supports std::chrono timezone
-   https://github.com/apache/arrow/issues/48593
-
 While Arrow uses the OS-provided timezone database on Linux and macOS, it requires a
 user-provided database on Windows. To download and extract the text version of
 the IANA timezone database follow the instructions in the C++
diff --git a/python/pyarrow/config.pxi b/python/pyarrow/config.pxi
@@ -108,7 +108,19 @@ def set_timezone_db_path(path):
     ----------
     path : str
         Path to text timezone database.
+    .. deprecated:: 23.0.0
+       This function is deprecated and will be removed in a future version.
+       PyArrow now uses the operating system's timezone database on Windows.
     """
+
+    warnings.warn(
+        "pyarrow.set_timezone_db_path is deprecated as of 23.0.0 "
+        "and will be removed in a future version. PyArrow now uses the "
+        "operating system's timezone database on Windows.",
+        FutureWarning,
+        stacklevel=2
+    )
+
     cdef:
         CGlobalOptions options
 
diff --git a/python/pyarrow/util.py b/python/pyarrow/util.py
@@ -250,7 +250,18 @@ def download_tzdata_on_windows():
     r"""
     Download and extract latest IANA timezone database into the
     location expected by Arrow which is %USERPROFILE%\Downloads\tzdata.
+    .. deprecated:: 23.0.0
+       This function is deprecated and will be removed in a future version.
+       PyArrow now uses the operating system's timezone database on Windows.
     """
+
+    warnings.warn(
+        "pyarrow.util.download_tzdata_on_windows is deprecated as of 23.0.0 "
+        "and will be removed in a future version. PyArrow now uses the "
+        "operating system's timezone database on Windows.",
+        FutureWarning,
+        stacklevel=2
+    )
     if sys.platform != 'win32':
         raise TypeError(f"Timezone database is already provided by {sys.platform}")
 
diff --git a/r/R/arrow-package.R b/r/R/arrow-package.R
@@ -153,7 +153,7 @@ s3_finalizer <- new.env(parent = emptyenv())
     # See https://issues.apache.org/jira/browse/ARROW-8379
     options(arrow.use_threads = FALSE)
 
-    # TODO(GH-48743): Remove when RTools upgrades to GCC with std::chrono timezone support
+    # TODO(GH-48743): Remove when RTools upgrades to libstdc++ with std::chrono timezone support
     # https://github.com/apache/arrow/issues/48743
     # Try to set timezone database for MinGW builds
     configure_tzdb()
@@ -173,7 +173,7 @@ s3_finalizer <- new.env(parent = emptyenv())
   invisible()
 }
 
-# TODO(GH-48743): Remove when RTools upgrades to GCC with std::chrono timezone support
+# TODO(GH-48743): Remove when RTools upgrades to libstdc++ with std::chrono timezone support
 # https://github.com/apache/arrow/issues/48743
 configure_tzdb <- function() {
   # This is needed on Windows MinGW builds where std::chrono timezone support
diff --git a/r/src/config.cpp b/r/src/config.cpp
@@ -34,7 +34,7 @@ std::vector<std::string> runtime_info() {
   return {info.simd_level, info.detected_simd_level};
 }
 
-// TODO(GH-48743): Remove when RTools upgrades to GCC with std::chrono timezone support
+// TODO(GH-48743): Remove when RTools upgrades to libstdc++ with std::chrono timezone support
 // https://github.com/apache/arrow/issues/48743
 // [[arrow::export]]
 void set_timezone_database(cpp11::strings path) {

Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,6 @@ std::string MakeSimdLevelString(QueryFlagFunction&& query_flag) {`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
`67`		`-// TODO(GH-48593): Remove when libc++ supports std::chrono timezone`
`68`		`-// https://github.com/apache/arrow/issues/48593`
`69`	`67`	`std::optional<std::string> timezone_db_path;`
`70`	`68`
`71`	`69`	`}; // namespace`
`@@ -88,8 +86,8 @@ RuntimeInfo GetRuntimeInfo() {`
`88`	`86`	`return info;`
`89`	`87`	`}`
`90`	`88`
`91`		`-// TODO(GH-48743): Remove when RTools upgrades to GCC with std::chrono timezone support`
`92`		`-// https://github.com/apache/arrow/issues/48743`
	`89`	`+// TODO(GH-48743): Remove when RTools upgrades to libstdc++ with std::chrono timezone`
	`90`	`+// support https://github.com/apache/arrow/issues/48743`
`93`	`91`	`Status Initialize(const GlobalOptions& options) noexcept {`
`94`	`92`	`if (options.timezone_db_path.has_value()) {`
`95`	`93`	`#if !USE_OS_TZDB`
Original file line number	Diff line number	Diff line change
`@@ -122,8 +122,6 @@ TEST(Misc, BuildInfo) {`
`122`	`122`	`ASSERT_THAT(info.full_so_version, ::testing::HasSubstr(info.so_version));`
`123`	`123`	`}`
`124`	`124`
`125`		`-// TODO(GH-48593): Remove when libc++ supports std::chrono timezone`
`126`		`-// https://github.com/apache/arrow/issues/48593`
`127`	`125`	`TEST(Misc, SetTimezoneConfig) {`
`128`	`126`	`#ifndef _WIN32`
`129`	`127`	`GTEST_SKIP() << "Can only set the Timezone database on Windows";`