kou commented on code in PR #43766:
URL: https://github.com/apache/arrow/pull/43766#discussion_r1736059900
##########
cpp/cmake_modules/ThirdpartyToolchain.cmake:
##########
@@ -1316,14 +1323,35 @@ if(ARROW_USE_BOOST)
endif()
endforeach()
- if(WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
- # boost/process/detail/windows/handle_workaround.hpp doesn't work
- # without BOOST_USE_WINDOWS_H with MinGW because MinGW doesn't
- # provide __kernel_entry without winternl.h.
- #
- # See also:
- #
https://github.com/boostorg/process/blob/develop/include/boost/process/detail/windows/handle_workaround.hpp
- target_compile_definitions(Boost::headers INTERFACE
"BOOST_USE_WINDOWS_H=1")
+ if(TARGET Boost::process)
+ # Boost >= 1.86
+ target_compile_definitions(Boost::process INTERFACE
"BOOST_PROCESS_HAVE_V1")
+ target_compile_definitions(Boost::process INTERFACE
"BOOST_PROCESS_HAVE_V2")
+ else()
+ # Boost < 1.86
+ add_library(Boost::process INTERFACE IMPORTED)
+ if(TARGET Boost::filesystem)
+ target_link_libraries(Boost::process INTERFACE Boost::filesystem)
+ endif()
+ if(TARGET Boost::system)
+ target_link_libraries(Boost::process INTERFACE Boost::system)
+ endif()
+ if(TARGET Boost::headers)
+ target_link_libraries(Boost::process INTERFACE Boost::headers)
+ endif()
+ if(Boost_VERSION VERSION_GREATER_EQUAL 1.80)
+ target_compile_definitions(Boost::process INTERFACE
"BOOST_PROCESS_HAVE_V2")
+ # Boost < 1.86 has a bug that
+ # boost::process::v2::process_environment::on_setup() isn't
+ # defined. We need to build Boost Process source to define it.
Review Comment:
Hmm. It's easy to test on my environment. Debian GNU/Linux sid still use
Boost 1.83.
Can we keep this until we have a difficult problem with Boost < 1.86 + v2?
##########
cpp/src/arrow/filesystem/gcsfs_test.cc:
##########
@@ -89,70 +67,64 @@ class GcsTestbench : public ::testing::Environment {
public:
GcsTestbench() {
port_ = std::to_string(GetListenPort());
- std::vector<std::string> names{"python3", "python"};
- // If the build script or application developer provides a value in the
PYTHON
- // environment variable, then just use that.
- if (const auto* env = std::getenv("PYTHON")) {
- names = {env};
- }
auto error = std::string("Could not start GCS emulator
'storage-testbench'");
+ auto server_process = std::make_unique<util::Process>();
+ auto status = server_process->SetExecutable("storage-testbench");
+ if (!status.ok()) {
+ error += " (exe not found)";
+ error_ = std::move(error);
+ return;
+ }
- auto testbench_is_running = [](bp::child& process, bp::ipstream& output) {
- // Wait for message: "* Restarting with"
- std::string line;
+ server_process->SetArgs({"--port", port_});
+ server_process->IgnoreStderr();
+ status = server_process->Execute();
+ if (!status.ok()) {
+ error += " (failed to launch: ";
Review Comment:
Simplified.
##########
cpp/src/arrow/filesystem/gcsfs_test.cc:
##########
@@ -89,70 +67,64 @@ class GcsTestbench : public ::testing::Environment {
public:
GcsTestbench() {
port_ = std::to_string(GetListenPort());
- std::vector<std::string> names{"python3", "python"};
- // If the build script or application developer provides a value in the
PYTHON
- // environment variable, then just use that.
- if (const auto* env = std::getenv("PYTHON")) {
- names = {env};
- }
auto error = std::string("Could not start GCS emulator
'storage-testbench'");
+ auto server_process = std::make_unique<util::Process>();
+ auto status = server_process->SetExecutable("storage-testbench");
+ if (!status.ok()) {
+ error += " (exe not found)";
+ error_ = std::move(error);
+ return;
Review Comment:
It's a good idea.
##########
cpp/src/arrow/testing/process.h:
##########
@@ -0,0 +1,46 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+#pragma once
+
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "arrow/status.h"
+#include "arrow/testing/visibility.h"
+
+namespace arrow::util {
+
+class ARROW_TESTING_EXPORT Process {
+ public:
+ Process();
+ ~Process();
+
+ Status SetExecutable(const std::string& path);
+ void SetArgs(const std::vector<std::string>& args);
+ void SetEnv(const std::string& name, const std::string& value);
+ void IgnoreStderr();
+ Status Execute();
+ bool IsRunning();
+ uint64_t id();
Review Comment:
Hmm. I feel that `Process::pid()` is redundant because "p" for "pid" is
"process".
BTW, if we remove this message
https://github.com/apache/arrow/pull/43766/files#diff-be71c610099ec5d0cd0adb9df543fbfe17ba1a6b5da8ef9b3cce970390910454L129
, we don't need to define this method. I think that the message is needless...
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
