Replace NumericHelper

Author: benibus

cpp/src/arrow/array/array_test.cc

@@ -2120,10 +2120,13 @@ void CheckSliceApproxEquals() {
   ASSERT_TRUE(slice1->ApproxEquals(slice2));
 }
 
+template <typename ArrowType>
+using NumericArgType = std::conditional_t<is_half_float_type<ArrowType>::value, Float16,
+                                          typename ArrowType::c_type>;
+
 template <typename TYPE>
 void CheckFloatingNanEquality() {
-  using V =
-      std::conditional_t<is_half_float_type<TYPE>::value, Float16, typename TYPE::c_type>;
+  using V = NumericArgType<TYPE>;
   std::shared_ptr<Array> a, b;
   std::shared_ptr<DataType> type = TypeTraits<TYPE>::type_singleton();
 
@@ -2184,8 +2187,7 @@ void CheckFloatingNanEquality() {
 
 template <typename TYPE>
 void CheckFloatingInfinityEquality() {
-  using V =
-      std::conditional_t<is_half_float_type<TYPE>::value, Float16, typename TYPE::c_type>;
+  using V = NumericArgType<TYPE>;
   std::shared_ptr<Array> a, b;
   std::shared_ptr<DataType> type = TypeTraits<TYPE>::type_singleton();
 
@@ -2253,8 +2255,7 @@ void CheckFloatingInfinityEquality() {
 
 template <typename TYPE>
 void CheckFloatingZeroEquality() {
-  using V =
-      std::conditional_t<is_half_float_type<TYPE>::value, Float16, typename TYPE::c_type>;
+  using V = NumericArgType<TYPE>;
   std::shared_ptr<Array> a, b;
   std::shared_ptr<DataType> type = TypeTraits<TYPE>::type_singleton();
 

cpp/src/arrow/scalar_test.cc

@@ -203,14 +203,9 @@ TEST(TestScalar, IdentityCast) {
   */
 }
 
-template <typename ARROW_TYPE>
-struct NumericHelper {
-  using ArgType = typename ARROW_TYPE::c_type;
-};
-template <>
-struct NumericHelper<HalfFloatType> {
-  using ArgType = Float16;
-};
+template <typename ArrowType>
+using NumericArgType = std::conditional_t<is_half_float_type<ArrowType>::value, Float16,
+                                          typename ArrowType::c_type>;
 
 template <typename T>
 class TestNumericScalar : public ::testing::Test {
@@ -224,7 +219,7 @@ using NumericArrowTypesPlusHalfFloat =
 TYPED_TEST_SUITE(TestNumericScalar, NumericArrowTypesPlusHalfFloat);
 
 TYPED_TEST(TestNumericScalar, Basics) {
-  using T = typename NumericHelper<TypeParam>::ArgType;
+  using T = NumericArgType<TypeParam>;
   using ScalarType = typename TypeTraits<TypeParam>::ScalarType;
 
   T value = static_cast<T>(1);
@@ -291,7 +286,7 @@ TYPED_TEST(TestNumericScalar, Basics) {
 }
 
 TYPED_TEST(TestNumericScalar, Hashing) {
-  using T = typename NumericHelper<TypeParam>::ArgType;
+  using T = NumericArgType<TypeParam>;
   using ScalarType = typename TypeTraits<TypeParam>::ScalarType;
 
   std::unordered_set<std::shared_ptr<Scalar>, Scalar::Hash, Scalar::PtrsEqual> set;
@@ -307,7 +302,7 @@ TYPED_TEST(TestNumericScalar, Hashing) {
 }
 
 TYPED_TEST(TestNumericScalar, MakeScalar) {
-  using T = typename NumericHelper<TypeParam>::ArgType;
+  using T = NumericArgType<TypeParam>;
   using ScalarType = typename TypeTraits<TypeParam>::ScalarType;
   auto type = TypeTraits<TypeParam>::type_singleton();
 
@@ -323,8 +318,7 @@ TYPED_TEST(TestNumericScalar, MakeScalar) {
 template <typename T>
 class TestRealScalar : public ::testing::Test {
  public:
-  using ValueType =
-      std::conditional_t<is_half_float_type<T>::value, Float16, typename T::c_type>;
+  using ValueType = NumericArgType<T>;
   using ScalarType = typename TypeTraits<T>::ScalarType;
 
   void SetUp() {