Remove temporary changes

Author: pitrou

ci/scripts/python_wheel_windows_test.bat

@@ -59,4 +59,4 @@ py -0p
 %PYTHON_CMD% C:\arrow\ci\scripts\python_wheel_validate_contents.py --path C:\arrow\python\repaired_wheels || exit /B 1
 
 @REM Execute unittest
-%PYTHON_CMD% -m pytest -r s --pyargs pyarrow.tests.test_compute || exit /B 1
+%PYTHON_CMD% -m pytest -r s --pyargs pyarrow || exit /B 1

cpp/src/arrow/compute/kernels/copy_data_internal.h

@@ -30,15 +30,13 @@ template <>
 struct CopyDataUtils<BooleanType> {
   static void CopyData(const DataType&, const Scalar& in, const int64_t in_offset,
                        uint8_t* out, const int64_t out_offset, const int64_t length) {
-    ARROW_LOG(INFO) << "Boolean CopyData from Scalar to offset " << out_offset << " with length " << length;
     bit_util::SetBitsTo(
         out, out_offset, length,
         in.is_valid ? checked_cast<const BooleanScalar&>(in).value : false);
   }
 
   static void CopyData(const DataType&, const uint8_t* in, const int64_t in_offset,
                        uint8_t* out, const int64_t out_offset, const int64_t length) {
-    ARROW_LOG(INFO) << "Boolean CopyData from Array at offset " << in_offset << " to offset " << out_offset << " with length " << length;
     arrow::internal::CopyBitmap(in, in_offset, length, out, out_offset);
   }
 
@@ -93,13 +91,11 @@ struct CopyDataUtils<
                        uint8_t* out, const int64_t out_offset, const int64_t length) {
     CType* begin = reinterpret_cast<CType*>(out) + out_offset;
     CType* end = begin + length;
-    ARROW_LOG(INFO) << "CopyData from Scalar to offset " << out_offset << " with length " << length;
     std::fill(begin, end, UnboxScalar<Type>::Unbox(in));
   }
 
   static void CopyData(const DataType&, const uint8_t* in, const int64_t in_offset,
                        uint8_t* out, const int64_t out_offset, const int64_t length) {
-    ARROW_LOG(INFO) << "CopyData from Array at offset " << in_offset << " to offset " << out_offset << " with length " << length;
     std::memcpy(out + out_offset * sizeof(CType), in + in_offset * sizeof(CType),
                 length * sizeof(CType));
   }

cpp/src/arrow/compute/kernels/scalar_if_else_test.cc

@@ -3145,7 +3145,9 @@ TEST(TestCoalesce, Boolean) {
   CheckScalar("coalesce", {scalar1, values1},
               ArrayFromJSON(type, "[false, false, false, false]"));
 
-  // Regression test from https://github.com/apache/arrow/issues/47234
+  // Regression test for GH-47234, which was failing due to a MSVC compiler bug
+  // (possibly https://developercommunity.visualstudio.com/t/10912292
+  // or https://developercommunity.visualstudio.com/t/10945478).
   auto values_with_null = ArrayFromJSON(type, "[true, false, false, false, false, null]");
   auto expected = ArrayFromJSON(type, "[true, false, false, false, false, true]");
   auto scalar2 = ScalarFromJSON(type, "true");

python/pyarrow/tests/test_compute.py

@@ -1952,46 +1952,26 @@ def test_fill_null_chunked_array(arrow_type):
     assert result.equals(expected)
 
 
-def test_fill_null_windows_regression1():
+def test_fill_null_windows_regression():
+    # Regression test for GH-47234, which was failing due to a MSVC compiler bug
+    # (possibly https://developercommunity.visualstudio.com/t/10912292
+    # or https://developercommunity.visualstudio.com/t/10945478)
     arr = pa.array([True, False, False, False, False, None])
     s = pa.scalar(True, type=pa.bool_())
 
     result = pa.compute.call_function("coalesce", [arr, s])
+    result.validate(full=True)
     expected = pa.array([True, False, False, False, False, True])
-
-    assert result.equals(expected)
-
-
-def test_fill_null_windows_regression2():
-    arr = pa.array([True, False, False, False, False, None])
-    s = True
-
-    result = pa.compute.call_function("coalesce", [arr, s])
-    expected = pa.array([True, False, False, False, False, True])
-
     assert result.equals(expected)
 
+    for ty in [pa.int8(), pa.int16(), pa.int32(), pa.int64()]:
+        arr = pa.array([1, 2, 3, 4, 5, None], type=ty)
+        s = pa.scalar(42, type=ty)
 
-def test_fill_null_windows_regression4():
-    ty = pa.int64()
-    arr = pa.array([1, 2, 3, 4, 5, None], type=ty)
-    s = pa.scalar(42, type=ty)
-
-    result = pa.compute.call_function("coalesce", [arr, s])
-    expected = pa.array([1, 2, 3, 4, 5, 42], type=ty)
-
-    assert result.equals(expected)
-
-
-def test_fill_null_windows_regression5():
-    ty = pa.int32()
-    arr = pa.array([1, 2, 3, 4, 5, None], type=ty)
-    s = pa.scalar(42, type=ty)
-
-    result = pa.compute.call_function("coalesce", [arr, s])
-    expected = pa.array([1, 2, 3, 4, 5, 42], type=ty)
-
-    assert result.equals(expected)
+        result = pa.compute.call_function("coalesce", [arr, s])
+        result.validate(full=True)
+        expected = pa.array([1, 2, 3, 4, 5, 42], type=ty)
+        assert result.equals(expected)
 
 
 def test_logical():