|
43 | 43 | #include "arrow/type_traits.h" |
44 | 44 | #include "arrow/util/bit_util.h" |
45 | 45 | #include "arrow/util/checked_cast.h" |
| 46 | +#include "arrow/util/chrono_internal.h" |
46 | 47 | #include "arrow/util/float16.h" |
47 | 48 | #include "arrow/util/logging_internal.h" |
48 | 49 | #include "arrow/util/range.h" |
49 | 50 | #include "arrow/util/ree_util.h" |
50 | 51 | #include "arrow/util/string.h" |
51 | 52 | #include "arrow/util/unreachable.h" |
52 | | -#include "arrow/vendored/datetime.h" |
53 | 53 | #include "arrow/visit_type_inline.h" |
54 | 54 |
|
55 | 55 | namespace arrow { |
56 | 56 |
|
| 57 | +namespace chrono = internal::chrono; |
| 58 | + |
57 | 59 | using internal::checked_cast; |
58 | 60 | using internal::checked_pointer_cast; |
59 | 61 | using internal::MakeLazyRange; |
@@ -631,14 +633,13 @@ class MakeFormatterImpl { |
631 | 633 | template <typename T> |
632 | 634 | enable_if_date<T, Status> Visit(const T&) { |
633 | 635 | using unit = typename std::conditional<std::is_same<T, Date32Type>::value, |
634 | | - arrow_vendored::date::days, |
635 | | - std::chrono::milliseconds>::type; |
| 636 | + chrono::days, std::chrono::milliseconds>::type; |
636 | 637 |
|
637 | | - static arrow_vendored::date::sys_days epoch{arrow_vendored::date::jan / 1 / 1970}; |
| 638 | + static chrono::sys_days epoch{chrono::jan / 1 / 1970}; |
638 | 639 |
|
639 | 640 | impl_ = [](const Array& array, int64_t index, std::ostream* os) { |
640 | 641 | unit value(checked_cast<const NumericArray<T>&>(array).Value(index)); |
641 | | - *os << arrow_vendored::date::format("%F", value + epoch); |
| 642 | + *os << chrono::format("%F", value + epoch); |
642 | 643 | }; |
643 | 644 | return Status::OK(); |
644 | 645 | } |
@@ -854,42 +855,41 @@ class MakeFormatterImpl { |
854 | 855 | auto value = checked_cast<const NumericArray<T>&>(array).Value(index); |
855 | 856 | // Using unqualified `format` directly would produce ambiguous |
856 | 857 | // lookup because of `std::format` (ARROW-15520). |
857 | | - namespace avd = arrow_vendored::date; |
858 | 858 | using std::chrono::nanoseconds; |
859 | 859 | using std::chrono::microseconds; |
860 | 860 | using std::chrono::milliseconds; |
861 | 861 | using std::chrono::seconds; |
862 | 862 | if (AddEpoch) { |
863 | | - static avd::sys_days epoch{avd::jan / 1 / 1970}; |
| 863 | + static chrono::sys_days epoch{chrono::jan / 1 / 1970}; |
864 | 864 |
|
865 | 865 | switch (unit) { |
866 | 866 | case TimeUnit::NANO: |
867 | | - *os << avd::format(fmt, static_cast<nanoseconds>(value) + epoch); |
| 867 | + *os << chrono::format(fmt, static_cast<nanoseconds>(value) + epoch); |
868 | 868 | break; |
869 | 869 | case TimeUnit::MICRO: |
870 | | - *os << avd::format(fmt, static_cast<microseconds>(value) + epoch); |
| 870 | + *os << chrono::format(fmt, static_cast<microseconds>(value) + epoch); |
871 | 871 | break; |
872 | 872 | case TimeUnit::MILLI: |
873 | | - *os << avd::format(fmt, static_cast<milliseconds>(value) + epoch); |
| 873 | + *os << chrono::format(fmt, static_cast<milliseconds>(value) + epoch); |
874 | 874 | break; |
875 | 875 | case TimeUnit::SECOND: |
876 | | - *os << avd::format(fmt, static_cast<seconds>(value) + epoch); |
| 876 | + *os << chrono::format(fmt, static_cast<seconds>(value) + epoch); |
877 | 877 | break; |
878 | 878 | } |
879 | 879 | return; |
880 | 880 | } |
881 | 881 | switch (unit) { |
882 | 882 | case TimeUnit::NANO: |
883 | | - *os << avd::format(fmt, static_cast<nanoseconds>(value)); |
| 883 | + *os << chrono::format(fmt, static_cast<nanoseconds>(value)); |
884 | 884 | break; |
885 | 885 | case TimeUnit::MICRO: |
886 | | - *os << avd::format(fmt, static_cast<microseconds>(value)); |
| 886 | + *os << chrono::format(fmt, static_cast<microseconds>(value)); |
887 | 887 | break; |
888 | 888 | case TimeUnit::MILLI: |
889 | | - *os << avd::format(fmt, static_cast<milliseconds>(value)); |
| 889 | + *os << chrono::format(fmt, static_cast<milliseconds>(value)); |
890 | 890 | break; |
891 | 891 | case TimeUnit::SECOND: |
892 | | - *os << avd::format(fmt, static_cast<seconds>(value)); |
| 892 | + *os << chrono::format(fmt, static_cast<seconds>(value)); |
893 | 893 | break; |
894 | 894 | } |
895 | 895 | }; |
|
0 commit comments