From 8d6f495a43e4dbe3e9f96c3e2d3ab42e9998a0ee Mon Sep 17 00:00:00 2001
From: Wes McKinney <wesm@apache.org>
Date: Thu, 18 Jun 2020 17:18:23 -0500
Subject: [PATCH 1/3] Refactor to share random tests testing amongst compare,
 take, filter kernels. Equip ArrayOf to generate random data for temporal,
 fixed size binary types

---
 .../compute/kernels/scalar_compare_test.cc    |  66 ++---
 cpp/src/arrow/compute/kernels/test_util.h     |  20 ++
 .../compute/kernels/vector_selection_test.cc  | 247 ++++++++----------
 cpp/src/arrow/testing/random.cc               |  26 ++
 4 files changed, 182 insertions(+), 177 deletions(-)

diff --git a/cpp/src/arrow/compute/kernels/scalar_compare_test.cc b/cpp/src/arrow/compute/kernels/scalar_compare_test.cc
index 0ee757b1280..2fceca6bdc6 100644
--- a/cpp/src/arrow/compute/kernels/scalar_compare_test.cc
+++ b/cpp/src/arrow/compute/kernels/scalar_compare_test.cc
@@ -373,46 +373,38 @@ TYPED_TEST(TestNumericCompareKernel, TestNullScalar) {
 TYPED_TEST_SUITE(TestNumericCompareKernel, NumericArrowTypes);
 
 template <typename Type>
-void DoRandomCompare(const std::shared_ptr<DataType>& type) {
-  using ScalarType = typename TypeTraits<Type>::ScalarType;
-  using CType = typename TypeTraits<Type>::CType;
-  auto rand = random::RandomArrayGenerator(0x5416447);
-  const int64_t length = 1000;
-  for (auto null_probability : {0.0, 0.01, 0.1, 0.25, 0.5, 1.0}) {
-    for (auto op : {EQUAL, NOT_EQUAL, GREATER, LESS_EQUAL}) {
-      auto data =
-          rand.Numeric<typename Type::PhysicalType>(length, 0, 100, null_probability);
-
-      auto data1 =
-          rand.Numeric<typename Type::PhysicalType>(length, 0, 100, null_probability);
-      auto data2 =
-          rand.Numeric<typename Type::PhysicalType>(length, 0, 100, null_probability);
-
-      // Create view of data as the type (e.g. timestamp)
-      auto array1 = Datum(*data1->View(type));
-      auto array2 = Datum(*data2->View(type));
-      auto fifty = Datum(std::make_shared<ScalarType>(CType(50), type));
-      auto options = CompareOptions(op);
-
-      ValidateCompare<Type>(options, array1, fifty);
-      ValidateCompare<Type>(options, fifty, array1);
-      ValidateCompare<Type>(options, array1, array2);
+struct CompareRandomNumeric {
+  static void Test(const std::shared_ptr<DataType>& type) {
+    using ScalarType = typename TypeTraits<Type>::ScalarType;
+    using CType = typename TypeTraits<Type>::CType;
+    auto rand = random::RandomArrayGenerator(0x5416447);
+    const int64_t length = 1000;
+    for (auto null_probability : {0.0, 0.01, 0.1, 0.25, 0.5, 1.0}) {
+      for (auto op : {EQUAL, NOT_EQUAL, GREATER, LESS_EQUAL}) {
+        auto data =
+            rand.Numeric<typename Type::PhysicalType>(length, 0, 100, null_probability);
+
+        auto data1 =
+            rand.Numeric<typename Type::PhysicalType>(length, 0, 100, null_probability);
+        auto data2 =
+            rand.Numeric<typename Type::PhysicalType>(length, 0, 100, null_probability);
+
+        // Create view of data as the type (e.g. timestamp)
+        auto array1 = Datum(*data1->View(type));
+        auto array2 = Datum(*data2->View(type));
+        auto fifty = Datum(std::make_shared<ScalarType>(CType(50), type));
+        auto options = CompareOptions(op);
+
+        ValidateCompare<Type>(options, array1, fifty);
+        ValidateCompare<Type>(options, fifty, array1);
+        ValidateCompare<Type>(options, array1, array2);
+      }
     }
   }
-}
-
-TYPED_TEST(TestNumericCompareKernel, RandomCompare) {
-  DoRandomCompare<TypeParam>(TypeTraits<TypeParam>::type_singleton());
-}
+};
 
-TEST(TestTemporalCompareKernel, RandomCompare) {
-  DoRandomCompare<Date32Type>(date32());
-  DoRandomCompare<Date64Type>(date64());
-  DoRandomCompare<Time32Type>(time32(TimeUnit::SECOND));
-  DoRandomCompare<Time64Type>(time64(TimeUnit::MICRO));
-  DoRandomCompare<TimestampType>(timestamp(TimeUnit::SECOND));
-  DoRandomCompare<TimestampType>(timestamp(TimeUnit::MICRO));
-  DoRandomCompare<DurationType>(duration(TimeUnit::MILLI));
+TEST(TestCompareKernel, PrimitiveRandomTests) {
+  TestRandomPrimitiveCTypes<CompareRandomNumeric>();
 }
 
 TYPED_TEST(TestNumericCompareKernel, SimpleCompareArrayArray) {
diff --git a/cpp/src/arrow/compute/kernels/test_util.h b/cpp/src/arrow/compute/kernels/test_util.h
index f01f5c7cc6b..eb7fd71bdfe 100644
--- a/cpp/src/arrow/compute/kernels/test_util.h
+++ b/cpp/src/arrow/compute/kernels/test_util.h
@@ -104,5 +104,25 @@ using TestingStringTypes =
 
 static constexpr random::SeedType kRandomSeed = 0x0ff1ce;
 
+template <template <typename> class DoTestFunctor>
+void TestRandomPrimitiveCTypes() {
+  DoTestFunctor<Int8Type>::Test(int8());
+  DoTestFunctor<Int16Type>::Test(int16());
+  DoTestFunctor<Int32Type>::Test(int32());
+  DoTestFunctor<Int64Type>::Test(int64());
+  DoTestFunctor<UInt8Type>::Test(uint8());
+  DoTestFunctor<UInt16Type>::Test(uint16());
+  DoTestFunctor<UInt32Type>::Test(uint32());
+  DoTestFunctor<UInt64Type>::Test(uint64());
+  DoTestFunctor<FloatType>::Test(float32());
+  DoTestFunctor<DoubleType>::Test(float64());
+  DoTestFunctor<Date64Type>::Test(date64());
+  DoTestFunctor<Time32Type>::Test(time32(TimeUnit::SECOND));
+  DoTestFunctor<Time64Type>::Test(time64(TimeUnit::MICRO));
+  DoTestFunctor<TimestampType>::Test(timestamp(TimeUnit::SECOND));
+  DoTestFunctor<TimestampType>::Test(timestamp(TimeUnit::MICRO));
+  DoTestFunctor<DurationType>::Test(duration(TimeUnit::MILLI));
+}
+
 }  // namespace compute
 }  // namespace arrow
diff --git a/cpp/src/arrow/compute/kernels/vector_selection_test.cc b/cpp/src/arrow/compute/kernels/vector_selection_test.cc
index fb8182e66f9..2360afe3722 100644
--- a/cpp/src/arrow/compute/kernels/vector_selection_test.cc
+++ b/cpp/src/arrow/compute/kernels/vector_selection_test.cc
@@ -39,44 +39,6 @@ using util::string_view;
 
 namespace compute {
 
-// ----------------------------------------------------------------------
-// Some random data generation helpers
-
-template <typename Type>
-std::shared_ptr<Array> RandomNumeric(int64_t length, double null_probability,
-                                     random::RandomArrayGenerator* rng) {
-  return rng->Numeric<Type>(length, 0, 127, null_probability);
-}
-
-std::shared_ptr<Array> RandomBoolean(int64_t length, double null_probability,
-                                     random::RandomArrayGenerator* rng) {
-  return rng->Boolean(length, 0.5, null_probability);
-}
-
-std::shared_ptr<Array> RandomString(int64_t length, double null_probability,
-                                    random::RandomArrayGenerator* rng) {
-  return rng->String(length, 0, 32, null_probability);
-}
-
-std::shared_ptr<Array> RandomLargeString(int64_t length, double null_probability,
-                                         random::RandomArrayGenerator* rng) {
-  return rng->LargeString(length, 0, 32, null_probability);
-}
-
-std::shared_ptr<Array> RandomFixedSizeBinary(int64_t length, double null_probability,
-                                             random::RandomArrayGenerator* rng) {
-  const int32_t value_size = 16;
-  int64_t data_nbytes = length * value_size;
-  std::shared_ptr<Buffer> data = *AllocateBuffer(data_nbytes);
-  random_bytes(data_nbytes, /*seed=*/0, data->mutable_data());
-  auto validity = rng->Boolean(length, 1 - null_probability);
-
-  // Assemble the data for a FixedSizeBinaryArray
-  auto values_data = std::make_shared<ArrayData>(fixed_size_binary(value_size), length);
-  values_data->buffers = {validity->data()->buffers[1], data};
-  return MakeArray(values_data);
-}
-
 // ----------------------------------------------------------------------
 
 TEST(GetTakeIndices, Basics) {
@@ -318,39 +280,6 @@ TYPED_TEST(TestFilterKernelWithNumeric, FilterNumeric) {
                                 ArrayFromJSON(boolean(), "[]"), this->drop_));
 }
 
-template <typename DataGenerator>
-void DoRandomFilterTests(DataGenerator&& generate_values) {
-  auto rand = random::RandomArrayGenerator(kRandomSeed);
-  for (size_t i = 3; i < 10; i++) {
-    const int64_t length = static_cast<int64_t>(1ULL << i);
-    for (auto null_probability : {0.0, 0.01, 0.1, 0.999, 1.0}) {
-      for (auto true_probability : {0.0, 0.1, 0.999, 1.0}) {
-        auto values = generate_values(length, null_probability, &rand);
-        auto filter = rand.Boolean(length + 1, true_probability, null_probability);
-        auto filter_no_nulls = rand.Boolean(length + 1, true_probability, 0.0);
-        ValidateFilter(values, filter->Slice(0, values->length()));
-        ValidateFilter(values, filter_no_nulls->Slice(0, values->length()));
-        // Test values and filter have different offsets
-        ValidateFilter(values->Slice(3), filter->Slice(4));
-        ValidateFilter(values->Slice(3), filter_no_nulls->Slice(4));
-      }
-    }
-  }
-}
-
-TYPED_TEST(TestFilterKernelWithNumeric, FilterRandomNumeric) {
-  DoRandomFilterTests(RandomNumeric<TypeParam>);
-}
-
-TEST(TestFilter, RandomBoolean) { DoRandomFilterTests(RandomBoolean); }
-
-TEST(TestFilter, RandomString) {
-  DoRandomFilterTests(RandomString);
-  DoRandomFilterTests(RandomLargeString);
-}
-
-TEST(TestFilter, RandomFixedSizeBinary) { DoRandomFilterTests(RandomFixedSizeBinary); }
-
 template <typename CType>
 using Comparator = bool(CType, CType);
 
@@ -965,60 +894,6 @@ uint64_t GetMaxIndex(int64_t values_length) {
   return static_cast<uint64_t>(values_length - 1);
 }
 
-template <typename ValuesType, typename IndexType>
-void CheckTakeRandom(const std::shared_ptr<Array>& values, int64_t indices_length,
-                     double null_probability, random::RandomArrayGenerator* rand) {
-  using IndexCType = typename IndexType::c_type;
-  IndexCType max_index = GetMaxIndex<IndexCType>(values->length());
-  auto indices = rand->Numeric<IndexType>(indices_length, static_cast<IndexCType>(0),
-                                          max_index, null_probability);
-  auto indices_no_nulls = rand->Numeric<IndexType>(
-      indices_length, static_cast<IndexCType>(0), max_index, /*null_probability=*/0.0);
-  ValidateTake<ValuesType>(values, indices);
-  ValidateTake<ValuesType>(values, indices_no_nulls);
-  // Sliced indices array
-  if (indices_length >= 2) {
-    indices = indices->Slice(1, indices_length - 2);
-    indices_no_nulls = indices_no_nulls->Slice(1, indices_length - 2);
-    ValidateTake<ValuesType>(values, indices);
-    ValidateTake<ValuesType>(values, indices_no_nulls);
-  }
-}
-
-template <typename ValuesType, typename DataGenerator>
-void DoRandomTakeTests(DataGenerator&& generate_values) {
-  auto rand = random::RandomArrayGenerator(kRandomSeed);
-  for (const int64_t length : {1, 16, 59}) {
-    for (const int64_t indices_length : {0, 5, 30}) {
-      for (const auto null_probability : {0.0, 0.05, 0.25, 0.95, 1.0}) {
-        auto values = generate_values(length, null_probability, &rand);
-        CheckTakeRandom<ValuesType, Int8Type>(values, indices_length, null_probability,
-                                              &rand);
-        CheckTakeRandom<ValuesType, Int16Type>(values, indices_length, null_probability,
-                                               &rand);
-        CheckTakeRandom<ValuesType, Int32Type>(values, indices_length, null_probability,
-                                               &rand);
-        CheckTakeRandom<ValuesType, Int64Type>(values, indices_length, null_probability,
-                                               &rand);
-        CheckTakeRandom<ValuesType, UInt8Type>(values, indices_length, null_probability,
-                                               &rand);
-        CheckTakeRandom<ValuesType, UInt16Type>(values, indices_length, null_probability,
-                                                &rand);
-        CheckTakeRandom<ValuesType, UInt32Type>(values, indices_length, null_probability,
-                                                &rand);
-        CheckTakeRandom<ValuesType, UInt64Type>(values, indices_length, null_probability,
-                                                &rand);
-        // Sliced values array
-        if (length > 2) {
-          values = values->Slice(1, length - 2);
-          CheckTakeRandom<ValuesType, UInt64Type>(values, indices_length,
-                                                  null_probability, &rand);
-        }
-      }
-    }
-  }
-}
-
 template <typename ArrowType>
 class TestTakeKernel : public ::testing::Test {};
 
@@ -1080,21 +955,6 @@ TYPED_TEST(TestTakeKernelWithNumeric, TakeNumeric) {
                                      "[0, -1, 0]", &arr));
 }
 
-TYPED_TEST(TestTakeKernelWithNumeric, TakeRandomNumeric) {
-  DoRandomTakeTests<TypeParam>(RandomNumeric<TypeParam>);
-}
-
-TEST(TestTakeKernel, TakeBooleanRandom) { DoRandomTakeTests<BooleanType>(RandomBoolean); }
-
-TEST(TestTakeKernelString, Random) {
-  DoRandomTakeTests<StringType>(RandomString);
-  DoRandomTakeTests<LargeStringType>(RandomLargeString);
-}
-
-TEST(TestTakeKernelFixedSizeBinary, Random) {
-  DoRandomTakeTests<FixedSizeBinaryType>(RandomFixedSizeBinary);
-}
-
 template <typename TypeClass>
 class TestTakeKernelWithString : public TestTakeKernel<TypeClass> {
  public:
@@ -1634,5 +1494,112 @@ TEST_F(TestTakeKernelWithTable, TakeTable) {
   this->AssertChunkedTake(schm, table_json, {"[0, 1]", "[2, 3]"}, table_json);
 }
 
+// ----------------------------------------------------------------------
+// Random data tests
+
+template <typename Unused = void>
+struct FilterRandomTest {
+  static void Test(const std::shared_ptr<DataType>& type) {
+    auto rand = random::RandomArrayGenerator(kRandomSeed);
+    const int64_t length = static_cast<int64_t>(1ULL << 10);
+    for (auto null_probability : {0.0, 0.01, 0.1, 0.999, 1.0}) {
+      for (auto true_probability : {0.0, 0.1, 0.999, 1.0}) {
+        auto values = rand.ArrayOf(type, length, null_probability);
+        auto filter = rand.Boolean(length + 1, true_probability, null_probability);
+        auto filter_no_nulls = rand.Boolean(length + 1, true_probability, 0.0);
+        ValidateFilter(values, filter->Slice(0, values->length()));
+        ValidateFilter(values, filter_no_nulls->Slice(0, values->length()));
+        // Test values and filter have different offsets
+        ValidateFilter(values->Slice(3), filter->Slice(4));
+        ValidateFilter(values->Slice(3), filter_no_nulls->Slice(4));
+      }
+    }
+  }
+};
+
+template <typename ValuesType, typename IndexType>
+void CheckTakeRandom(const std::shared_ptr<Array>& values, int64_t indices_length,
+                     double null_probability, random::RandomArrayGenerator* rand) {
+  using IndexCType = typename IndexType::c_type;
+  IndexCType max_index = GetMaxIndex<IndexCType>(values->length());
+  auto indices = rand->Numeric<IndexType>(indices_length, static_cast<IndexCType>(0),
+                                          max_index, null_probability);
+  auto indices_no_nulls = rand->Numeric<IndexType>(
+      indices_length, static_cast<IndexCType>(0), max_index, /*null_probability=*/0.0);
+  ValidateTake<ValuesType>(values, indices);
+  ValidateTake<ValuesType>(values, indices_no_nulls);
+  // Sliced indices array
+  if (indices_length >= 2) {
+    indices = indices->Slice(1, indices_length - 2);
+    indices_no_nulls = indices_no_nulls->Slice(1, indices_length - 2);
+    ValidateTake<ValuesType>(values, indices);
+    ValidateTake<ValuesType>(values, indices_no_nulls);
+  }
+}
+
+template <typename ValuesType>
+struct TakeRandomTest {
+  static void Test(const std::shared_ptr<DataType>& type) {
+    auto rand = random::RandomArrayGenerator(kRandomSeed);
+    for (const int64_t length : {1, 16, 59}) {
+      for (const int64_t indices_length : {0, 5, 30}) {
+        for (const auto null_probability : {0.0, 0.05, 0.25, 0.95, 1.0}) {
+          auto values = rand.ArrayOf(type, length, null_probability);
+          CheckTakeRandom<ValuesType, Int8Type>(values, indices_length, null_probability,
+                                                &rand);
+          CheckTakeRandom<ValuesType, Int16Type>(values, indices_length, null_probability,
+                                                 &rand);
+          CheckTakeRandom<ValuesType, Int32Type>(values, indices_length, null_probability,
+                                                 &rand);
+          CheckTakeRandom<ValuesType, Int64Type>(values, indices_length, null_probability,
+                                                 &rand);
+          CheckTakeRandom<ValuesType, UInt8Type>(values, indices_length, null_probability,
+                                                 &rand);
+          CheckTakeRandom<ValuesType, UInt16Type>(values, indices_length,
+                                                  null_probability, &rand);
+          CheckTakeRandom<ValuesType, UInt32Type>(values, indices_length,
+                                                  null_probability, &rand);
+          CheckTakeRandom<ValuesType, UInt64Type>(values, indices_length,
+                                                  null_probability, &rand);
+          // Sliced values array
+          if (length > 2) {
+            values = values->Slice(1, length - 2);
+            CheckTakeRandom<ValuesType, UInt64Type>(values, indices_length,
+                                                    null_probability, &rand);
+          }
+        }
+      }
+    }
+  }
+};
+
+TEST(TestFilter, PrimitiveRandom) { TestRandomPrimitiveCTypes<FilterRandomTest>(); }
+
+TEST(TestFilter, RandomBoolean) { FilterRandomTest<>::Test(boolean()); }
+
+TEST(TestFilter, RandomString) {
+  FilterRandomTest<>::Test(utf8());
+  FilterRandomTest<>::Test(large_utf8());
+}
+
+TEST(TestFilter, RandomFixedSizeBinary) {
+  FilterRandomTest<>::Test(fixed_size_binary(0));
+  FilterRandomTest<>::Test(fixed_size_binary(16));
+}
+
+TEST(TestTake, PrimitiveRandom) { TestRandomPrimitiveCTypes<TakeRandomTest>(); }
+
+TEST(TestTake, RandomBoolean) { TakeRandomTest<BooleanType>::Test(boolean()); }
+
+TEST(TestTake, RandomString) {
+  TakeRandomTest<StringType>::Test(utf8());
+  TakeRandomTest<LargeStringType>::Test(large_utf8());
+}
+
+TEST(TestTake, RandomFixedSizeBinary) {
+  TakeRandomTest<FixedSizeBinaryType>::Test(fixed_size_binary(0));
+  TakeRandomTest<FixedSizeBinaryType>::Test(fixed_size_binary(16));
+}
+
 }  // namespace compute
 }  // namespace arrow
diff --git a/cpp/src/arrow/testing/random.cc b/cpp/src/arrow/testing/random.cc
index 6a1249d330c..cdb1096eb5a 100644
--- a/cpp/src/arrow/testing/random.cc
+++ b/cpp/src/arrow/testing/random.cc
@@ -290,6 +290,17 @@ struct RandomArrayGeneratorOfImpl {
     return Status::OK();
   }
 
+  template <typename T>
+  enable_if_t<is_temporal_type<T>::value && !std::is_same<T, DayTimeIntervalType>::value,
+              Status>
+  Visit(const T&) {
+    auto max = std::numeric_limits<typename T::c_type>::max();
+    auto min = std::numeric_limits<typename T::c_type>::lowest();
+    auto values =
+        rag_->Numeric<typename T::PhysicalType>(size_, min, max, null_probability_);
+    return values->View(type_).Value(&out_);
+  }
+
   template <typename T>
   enable_if_base_binary<T, Status> Visit(const T& t) {
     int32_t min_length = 0;
@@ -303,6 +314,21 @@ struct RandomArrayGeneratorOfImpl {
     return out_->View(type_).Value(&out_);
   }
 
+  template <typename T>
+  enable_if_fixed_size_binary<T, Status> Visit(const T& t) {
+    const int32_t value_size = t.byte_width();
+    int64_t data_nbytes = size_ * value_size;
+    ARROW_ASSIGN_OR_RAISE(std::shared_ptr<Buffer> data, AllocateBuffer(data_nbytes));
+    random_bytes(data_nbytes, /*seed=*/0, data->mutable_data());
+    auto validity = rag_->Boolean(size_, 1 - null_probability_);
+
+    // Assemble the data for a FixedSizeBinaryArray
+    auto values_data = std::make_shared<ArrayData>(type_, size_);
+    values_data->buffers = {validity->data()->buffers[1], data};
+    out_ = MakeArray(values_data);
+    return Status::OK();
+  }
+
   Status Visit(const DataType& t) {
     return Status::NotImplemented("generation of random arrays of type ", t);
   }

From b6a7f77e6f48c8ce08fe14ba9bfd31c6e1c46b59 Mon Sep 17 00:00:00 2001
From: Wes McKinney <wesm@apache.org>
Date: Fri, 19 Jun 2020 08:41:54 -0500
Subject: [PATCH 2/3] Revert to more 'scalable' testing approach

---
 .../compute/kernels/vector_selection_test.cc  | 50 +++++++++----------
 cpp/src/arrow/testing/random.cc               |  8 ++-
 2 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/cpp/src/arrow/compute/kernels/vector_selection_test.cc b/cpp/src/arrow/compute/kernels/vector_selection_test.cc
index 2360afe3722..b0a61b6efa0 100644
--- a/cpp/src/arrow/compute/kernels/vector_selection_test.cc
+++ b/cpp/src/arrow/compute/kernels/vector_selection_test.cc
@@ -1541,33 +1541,31 @@ template <typename ValuesType>
 struct TakeRandomTest {
   static void Test(const std::shared_ptr<DataType>& type) {
     auto rand = random::RandomArrayGenerator(kRandomSeed);
-    for (const int64_t length : {1, 16, 59}) {
-      for (const int64_t indices_length : {0, 5, 30}) {
-        for (const auto null_probability : {0.0, 0.05, 0.25, 0.95, 1.0}) {
-          auto values = rand.ArrayOf(type, length, null_probability);
-          CheckTakeRandom<ValuesType, Int8Type>(values, indices_length, null_probability,
+    const int64_t values_length = 64 * 16 + 1;
+    const int64_t indices_length = 64 * 4 + 1;
+    for (const auto null_probability : {0.0, 0.001, 0.05, 0.25, 0.95, 0.999, 1.0}) {
+      auto values = rand.ArrayOf(type, values_length, null_probability);
+      CheckTakeRandom<ValuesType, Int8Type>(values, indices_length, null_probability,
+                                            &rand);
+      CheckTakeRandom<ValuesType, Int16Type>(values, indices_length, null_probability,
+                                             &rand);
+      CheckTakeRandom<ValuesType, Int32Type>(values, indices_length, null_probability,
+                                             &rand);
+      CheckTakeRandom<ValuesType, Int64Type>(values, indices_length, null_probability,
+                                             &rand);
+      CheckTakeRandom<ValuesType, UInt8Type>(values, indices_length, null_probability,
+                                             &rand);
+      CheckTakeRandom<ValuesType, UInt16Type>(values, indices_length, null_probability,
+                                              &rand);
+      CheckTakeRandom<ValuesType, UInt32Type>(values, indices_length, null_probability,
+                                              &rand);
+      CheckTakeRandom<ValuesType, UInt64Type>(values, indices_length, null_probability,
+                                              &rand);
+      // Sliced values array
+      if (values_length > 2) {
+        values = values->Slice(1, values_length - 2);
+        CheckTakeRandom<ValuesType, UInt64Type>(values, indices_length, null_probability,
                                                 &rand);
-          CheckTakeRandom<ValuesType, Int16Type>(values, indices_length, null_probability,
-                                                 &rand);
-          CheckTakeRandom<ValuesType, Int32Type>(values, indices_length, null_probability,
-                                                 &rand);
-          CheckTakeRandom<ValuesType, Int64Type>(values, indices_length, null_probability,
-                                                 &rand);
-          CheckTakeRandom<ValuesType, UInt8Type>(values, indices_length, null_probability,
-                                                 &rand);
-          CheckTakeRandom<ValuesType, UInt16Type>(values, indices_length,
-                                                  null_probability, &rand);
-          CheckTakeRandom<ValuesType, UInt32Type>(values, indices_length,
-                                                  null_probability, &rand);
-          CheckTakeRandom<ValuesType, UInt64Type>(values, indices_length,
-                                                  null_probability, &rand);
-          // Sliced values array
-          if (length > 2) {
-            values = values->Slice(1, length - 2);
-            CheckTakeRandom<ValuesType, UInt64Type>(values, indices_length,
-                                                    null_probability, &rand);
-          }
-        }
       }
     }
   }
diff --git a/cpp/src/arrow/testing/random.cc b/cpp/src/arrow/testing/random.cc
index cdb1096eb5a..de99052a9f3 100644
--- a/cpp/src/arrow/testing/random.cc
+++ b/cpp/src/arrow/testing/random.cc
@@ -282,7 +282,7 @@ struct RandomArrayGeneratorOfImpl {
   }
 
   template <typename T>
-  enable_if_number<T, Status> Visit(const T&) {
+  enable_if_integer<T, Status> Visit(const T&) {
     auto max = std::numeric_limits<typename T::c_type>::max();
     auto min = std::numeric_limits<typename T::c_type>::lowest();
 
@@ -290,6 +290,12 @@ struct RandomArrayGeneratorOfImpl {
     return Status::OK();
   }
 
+  template <typename T>
+  enable_if_floating_point<T, Status> Visit(const T&) {
+    out_ = rag_->Numeric<T>(size_, 0., 1., null_probability_);
+    return Status::OK();
+  }
+
   template <typename T>
   enable_if_t<is_temporal_type<T>::value && !std::is_same<T, DayTimeIntervalType>::value,
               Status>

From 5f8391b979e1e86750ac48c2f42bc1bc17c96896 Mon Sep 17 00:00:00 2001
From: Wes McKinney <wesm@apache.org>
Date: Fri, 19 Jun 2020 08:46:56 -0500
Subject: [PATCH 3/3] Add missing date32 case

---
 cpp/src/arrow/compute/kernels/test_util.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cpp/src/arrow/compute/kernels/test_util.h b/cpp/src/arrow/compute/kernels/test_util.h
index eb7fd71bdfe..9b85c873c0d 100644
--- a/cpp/src/arrow/compute/kernels/test_util.h
+++ b/cpp/src/arrow/compute/kernels/test_util.h
@@ -116,6 +116,7 @@ void TestRandomPrimitiveCTypes() {
   DoTestFunctor<UInt64Type>::Test(uint64());
   DoTestFunctor<FloatType>::Test(float32());
   DoTestFunctor<DoubleType>::Test(float64());
+  DoTestFunctor<Date32Type>::Test(date32());
   DoTestFunctor<Date64Type>::Test(date64());
   DoTestFunctor<Time32Type>::Test(time32(TimeUnit::SECOND));
   DoTestFunctor<Time64Type>::Test(time64(TimeUnit::MICRO));