You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2018/08/21 21:04:52 UTC
[arrow] branch master updated: ARROW-3095: [Plasma] Move plasma
store
This is an automated email from the ASF dual-hosted git repository.
wesm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 53e7594 ARROW-3095: [Plasma] Move plasma store
53e7594 is described below
commit 53e7594ae8657040d6a85eb98fb172dd0355500f
Author: Philipp Moritz <pc...@gmail.com>
AuthorDate: Tue Aug 21 17:04:47 2018 -0400
ARROW-3095: [Plasma] Move plasma store
@pitrou Does this fix the issue for you?
Author: Philipp Moritz <pc...@gmail.com>
Author: Wes McKinney <we...@apache.org>
Closes #2452 from pcmoritz/move-plasma-store and squashes the following commits:
045413ce <Wes McKinney> Fix target name
fbf6fb18 <Philipp Moritz> fix
c2c7f321 <Philipp Moritz> linting
08ec0abb <Philipp Moritz> fix
e6b442b2 <Philipp Moritz> fix
0a00371e <Philipp Moritz> fix
5bcd1f69 <Philipp Moritz> move plasma store executable
---
ci/travis_script_plasma_java_client.sh | 2 +-
cpp/apidoc/tutorials/plasma.md | 8 ++++----
cpp/cmake_modules/FindPlasma.cmake | 2 +-
cpp/src/plasma/CMakeLists.txt | 12 ++++++------
cpp/src/plasma/plasma.pc.in | 2 +-
cpp/src/plasma/test/client_tests.cc | 7 ++++---
java/plasma/test.sh | 2 +-
python/pyarrow/__init__.py | 2 +-
python/pyarrow/plasma.py | 3 ++-
python/setup.py | 4 ++--
10 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/ci/travis_script_plasma_java_client.sh b/ci/travis_script_plasma_java_client.sh
index 628796d..d7dc3bc 100755
--- a/ci/travis_script_plasma_java_client.sh
+++ b/ci/travis_script_plasma_java_client.sh
@@ -24,7 +24,7 @@ PLASMA_JAVA_DIR=${TRAVIS_BUILD_DIR}/java/plasma
pushd $PLASMA_JAVA_DIR
mvn clean install
-export PLASMA_STORE=${TRAVIS_BUILD_DIR}/cpp-install/bin/plasma_store
+export PLASMA_STORE=${TRAVIS_BUILD_DIR}/cpp-install/bin/plasma_store_server
java -cp target/test-classes:target/classes -Djava.library.path=${TRAVIS_BUILD_DIR}/cpp-build/debug/ org.apache.arrow.plasma.PlasmaClientTest
popd
diff --git a/cpp/apidoc/tutorials/plasma.md b/cpp/apidoc/tutorials/plasma.md
index 5a0a2ba..2875d55 100644
--- a/cpp/apidoc/tutorials/plasma.md
+++ b/cpp/apidoc/tutorials/plasma.md
@@ -36,7 +36,7 @@ To start running the Plasma object store so that clients may
connect and access the data, run the following command:
```
-plasma_store -m 1000000000 -s /tmp/plasma
+plasma_store_server -m 1000000000 -s /tmp/plasma
```
The `-m` flag specifies the size of the object store in bytes. The `-s` flag
@@ -45,7 +45,7 @@ specifies the path of the Unix domain socket that the store will listen at.
Therefore, the above command initializes a Plasma store up to 1 GB of memory
and sets the socket to `/tmp/plasma.`
-The Plasma store will remain available as long as the `plasma_store` process is
+The Plasma store will remain available as long as the `plasma_store_server` process is
running in a terminal window. Messages, such as alerts for disconnecting
clients, may occasionally be output. To stop running the Plasma store, you
can press `Ctrl-C` in the terminal window.
@@ -54,14 +54,14 @@ Alternatively, you can run the Plasma store in the background and ignore all
message output with the following terminal command:
```
-plasma_store -m 1000000000 -s /tmp/plasma 1> /dev/null 2> /dev/null &
+plasma_store_server -m 1000000000 -s /tmp/plasma 1> /dev/null 2> /dev/null &
```
The Plasma store will instead run silently in the background. To stop running
the Plasma store in this case, issue the command below:
```
-killall plasma_store
+killall plasma_store_server
```
Creating a Plasma client
diff --git a/cpp/cmake_modules/FindPlasma.cmake b/cpp/cmake_modules/FindPlasma.cmake
index d85df09..6a6bc10 100644
--- a/cpp/cmake_modules/FindPlasma.cmake
+++ b/cpp/cmake_modules/FindPlasma.cmake
@@ -42,7 +42,7 @@ if ("$ENV{ARROW_HOME}" STREQUAL "")
else()
set(PLASMA_HOME "$ENV{ARROW_HOME}")
- set(PLASMA_EXECUTABLE ${PLASMA_HOME}/bin/plasma_store)
+ set(PLASMA_EXECUTABLE ${PLASMA_HOME}/bin/plasma_store_server)
set(PLASMA_SEARCH_HEADER_PATHS
${PLASMA_HOME}/include
diff --git a/cpp/src/plasma/CMakeLists.txt b/cpp/src/plasma/CMakeLists.txt
index a753e98..a068951 100644
--- a/cpp/src/plasma/CMakeLists.txt
+++ b/cpp/src/plasma/CMakeLists.txt
@@ -124,8 +124,8 @@ if ("${COMPILER_FAMILY}" STREQUAL "gcc")
" -Wno-conversion")
endif()
-add_executable(plasma_store store.cc)
-target_link_libraries(plasma_store plasma_static ${PLASMA_LINK_LIBS})
+add_executable(plasma_store_server store.cc)
+target_link_libraries(plasma_store_server plasma_static ${PLASMA_LINK_LIBS})
if (ARROW_RPATH_ORIGIN)
if (APPLE)
@@ -133,7 +133,7 @@ if (ARROW_RPATH_ORIGIN)
else()
set(_lib_install_rpath "\$ORIGIN")
endif()
- set_target_properties(plasma_store PROPERTIES
+ set_target_properties(plasma_store_server PROPERTIES
INSTALL_RPATH ${_lib_install_rpath})
endif()
@@ -146,8 +146,8 @@ install(FILES
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/plasma")
# Plasma store
-set_target_properties(plasma_store PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE)
-install(TARGETS plasma_store DESTINATION ${CMAKE_INSTALL_BINDIR})
+set_target_properties(plasma_store_server PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE)
+install(TARGETS plasma_store_server DESTINATION ${CMAKE_INSTALL_BINDIR})
# pkg-config support
configure_file(plasma.pc.in
@@ -200,4 +200,4 @@ ADD_ARROW_TEST(test/serialization_tests
EXTRA_LINK_LIBS plasma_static ${PLASMA_LINK_LIBS})
ADD_ARROW_TEST(test/client_tests
EXTRA_LINK_LIBS plasma_static ${PLASMA_LINK_LIBS}
- EXTRA_DEPENDENCIES plasma_store)
+ EXTRA_DEPENDENCIES plasma_store_server)
diff --git a/cpp/src/plasma/plasma.pc.in b/cpp/src/plasma/plasma.pc.in
index 60cc113..dc01260 100644
--- a/cpp/src/plasma/plasma.pc.in
+++ b/cpp/src/plasma/plasma.pc.in
@@ -22,7 +22,7 @@ includedir=${prefix}/include
so_version=@PLASMA_SO_VERSION@
abi_version=@PLASMA_SO_VERSION@
full_so_version=@PLASMA_FULL_SO_VERSION@
-executable=${prefix}/@CMAKE_INSTALL_BINDIR@/plasma_store
+executable=${prefix}/@CMAKE_INSTALL_BINDIR@/plasma_store_server
Name: Plasma
Description: Plasma is an in-memory object store and cache for big data.
diff --git a/cpp/src/plasma/test/client_tests.cc b/cpp/src/plasma/test/client_tests.cc
index a2418ac..4469c60 100644
--- a/cpp/src/plasma/test/client_tests.cc
+++ b/cpp/src/plasma/test/client_tests.cc
@@ -58,7 +58,8 @@ class TestPlasmaStore : public ::testing::Test {
std::string plasma_directory =
test_executable.substr(0, test_executable.find_last_of("/"));
- std::string plasma_command = plasma_directory + "/plasma_store -m 1000000000 -s " +
+ std::string plasma_command = plasma_directory +
+ "/plasma_store_server -m 1000000000 -s " +
store_socket_name_ + " 1> /dev/null 2> /dev/null &";
system(plasma_command.c_str());
ARROW_CHECK_OK(client_.Connect(store_socket_name_, ""));
@@ -72,10 +73,10 @@ class TestPlasmaStore : public ::testing::Test {
#ifdef COVERAGE_BUILD
// Ask plasma_store to exit gracefully and give it time to write out
// coverage files
- system("killall -TERM plasma_store");
+ system("killall -TERM plasma_store_server");
std::this_thread::sleep_for(std::chrono::milliseconds(200));
#endif
- system("killall -KILL plasma_store");
+ system("killall -KILL plasma_store_server");
}
void CreateObject(PlasmaClient& client, const ObjectID& object_id,
diff --git a/java/plasma/test.sh b/java/plasma/test.sh
index ef0f28b..c16c772 100755
--- a/java/plasma/test.sh
+++ b/java/plasma/test.sh
@@ -52,5 +52,5 @@ pushd ../../cpp
popd
mvn clean install
-export PLASMA_STORE=$ROOT_DIR/../../cpp/release/release/plasma_store
+export PLASMA_STORE=$ROOT_DIR/../../cpp/release/release/plasma_store_server
java -cp target/test-classes:target/classes -Djava.library.path=$ROOT_DIR/../../cpp/release/release/ org.apache.arrow.plasma.PlasmaClientTest
diff --git a/python/pyarrow/__init__.py b/python/pyarrow/__init__.py
index cb6b599..7fb1610 100644
--- a/python/pyarrow/__init__.py
+++ b/python/pyarrow/__init__.py
@@ -163,7 +163,7 @@ def _plasma_store_entry_point():
"""
import pyarrow
plasma_store_executable = _os.path.join(pyarrow.__path__[0],
- "plasma_store")
+ "plasma_store_server")
_os.execv(plasma_store_executable, _sys.argv)
# ----------------------------------------------------------------------
diff --git a/python/pyarrow/plasma.py b/python/pyarrow/plasma.py
index 2f77f5c..fbca9d5 100644
--- a/python/pyarrow/plasma.py
+++ b/python/pyarrow/plasma.py
@@ -100,7 +100,8 @@ def start_plasma_store(plasma_store_memory,
tmpdir = tempfile.mkdtemp(prefix='test_plasma-')
try:
plasma_store_name = os.path.join(tmpdir, 'plasma.sock')
- plasma_store_executable = os.path.join(pa.__path__[0], "plasma_store")
+ plasma_store_executable = os.path.join(
+ pa.__path__[0], "plasma_store_server")
command = [plasma_store_executable,
"-s", plasma_store_name,
"-m", str(plasma_store_memory)]
diff --git a/python/setup.py b/python/setup.py
index b8d3a6d..5203003 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -345,10 +345,10 @@ class build_ext(_build_ext):
if self.with_plasma:
# Move the plasma store
- source = os.path.join(self.build_type, "plasma_store")
+ source = os.path.join(self.build_type, "plasma_store_server")
target = os.path.join(build_lib,
self._get_build_dir(),
- "plasma_store")
+ "plasma_store_server")
shutil.move(source, target)
def _failure_permitted(self, name):