From 84caffce00e1801a1fce51960ee93a98074cc5c4 Mon Sep 17 00:00:00 2001 From: Hyunseok Seo Date: Mon, 30 Oct 2023 19:54:04 +0900 Subject: [PATCH 1/2] feat(cpp): Remove scalar regacy as a draft --- cpp/src/arrow/scalar_test.cc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/cpp/src/arrow/scalar_test.cc b/cpp/src/arrow/scalar_test.cc index a7ba5980feb..9d40e688f1d 100644 --- a/cpp/src/arrow/scalar_test.cc +++ b/cpp/src/arrow/scalar_test.cc @@ -1043,22 +1043,22 @@ TYPED_TEST(TestNumericScalar, Cast) { std::shared_ptr other_scalar; ASSERT_OK_AND_ASSIGN(other_scalar, Scalar::Parse(other_type, repr)); - ASSERT_OK_AND_ASSIGN(auto cast_to_other, scalar->CastTo(other_type)) - ASSERT_EQ(*cast_to_other, *other_scalar); + ASSERT_OK_AND_ASSIGN(auto cast_to_other, Cast(scalar, other_type)) + ASSERT_EQ(*cast_to_other.scalar(), *other_scalar); - ASSERT_OK_AND_ASSIGN(auto cast_from_other, other_scalar->CastTo(type)) - ASSERT_EQ(*cast_from_other, *scalar); + ASSERT_OK_AND_ASSIGN(auto cast_from_other, Cast(other_scalar, type)) + ASSERT_EQ(*cast_from_other.scalar(), *scalar); } ASSERT_OK_AND_ASSIGN(auto cast_from_string, - StringScalar(std::string(repr)).CastTo(type)); - ASSERT_EQ(*cast_from_string, *scalar); + Cast(StringScalar(std::string(repr)), type)); + ASSERT_EQ(*cast_from_string.scalar(), *scalar); if (is_integer_type::value) { - ASSERT_OK_AND_ASSIGN(auto cast_to_string, scalar->CastTo(utf8())); - ASSERT_EQ( - std::string_view(*checked_cast(*cast_to_string).value), - repr); + ASSERT_OK_AND_ASSIGN(auto cast_to_string, Cast(scalar, utf8())); + ASSERT_EQ(std::string_view( + *checked_cast(*cast_to_string.scalar()).value), + repr); } } } From a9a7d0d403ea37c34559601fda739433e67f6138 Mon Sep 17 00:00:00 2001 From: Hyunseok Seo Date: Sun, 3 Dec 2023 10:50:28 +0900 Subject: [PATCH 2/2] Remove legacy code for happy case --- cpp/src/arrow/dataset/partition_test.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cpp/src/arrow/dataset/partition_test.cc b/cpp/src/arrow/dataset/partition_test.cc index 1e932948676..7ec96929a93 100644 --- a/cpp/src/arrow/dataset/partition_test.cc +++ b/cpp/src/arrow/dataset/partition_test.cc @@ -28,6 +28,7 @@ #include "arrow/compute/api_scalar.h" #include "arrow/compute/api_vector.h" +#include "arrow/compute/cast.h" #include "arrow/dataset/dataset.h" #include "arrow/dataset/file_ipc.h" #include "arrow/dataset/test_util_internal.h" @@ -40,6 +41,8 @@ namespace arrow { +using compute::Cast; + using internal::checked_pointer_cast; namespace dataset { @@ -335,7 +338,7 @@ TEST_F(TestPartitioning, DirectoryPartitioningWithTemporal) { partitioning_ = std::make_shared( schema({field("year", int32()), field("month", int8()), field("day", temporal)})); - ASSERT_OK_AND_ASSIGN(auto day, StringScalar("2020-06-08").CastTo(temporal)); + ASSERT_OK_AND_ASSIGN(auto day, Cast(StringScalar("2020-06-08"), temporal)); AssertParse("/2020/06/2020-06-08/", and_({equal(field_ref("year"), literal(2020)), equal(field_ref("month"), literal(6)),