cleanups

Author: pcmoritz

cpp/src/plasma/CMakeLists.txt

@@ -167,10 +167,10 @@ if(ARROW_PLASMA_JAVA_CLIENT)
   include_directories(${JAVA_INCLUDE_PATH})
   include_directories(${JAVA_INCLUDE_PATH2})
   if (JNI_FOUND)
-    message (STATUS "JNI_INCLUDE_DIRS=${JNI_INCLUDE_DIRS}")
-    message (STATUS "JNI_LIBRARIES=${JNI_LIBRARIES}")
+    message (STATUS "JNI_INCLUDE_DIRS = ${JNI_INCLUDE_DIRS}")
+    message (STATUS "JNI_LIBRARIES = ${JNI_LIBRARIES}")
   else()
-    message (WARNING "NOT FIND JNI")   
+    message (WARNING "Could not find JNI")
   endif()
 
   add_compile_options("-I$ENV{JAVA_HOME}/include/")
@@ -187,8 +187,7 @@ if(ARROW_PLASMA_JAVA_CLIENT)
   file(GLOB PLASMA_LIBRARY_EXT_java_SRC
     lib/java/*.cc lib/*.cc)
   add_library(plasma_java SHARED
-    ${PLASMA_LIBRARY_EXT_java_SRC}
-    )
+    ${PLASMA_LIBRARY_EXT_java_SRC})
 
   if(APPLE)
     target_link_libraries(plasma_java plasma_static ${PLASMA_LINK_LIBS} "-undefined dynamic_lookup" -Wl,-force_load,${FLATBUFFERS_STATIC_LIB} ${FLATBUFFERS_STATIC_LIB} ${PTHREAD_LIBRARY})

cpp/src/plasma/lib/java/org_apache_arrow_plasma_PlasmaClientJNI.cc

@@ -14,6 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+
 #include "plasma/lib/java/org_apache_arrow_plasma_PlasmaClientJNI.h"
 #include <pthread.h>
 #include <stdlib.h>
@@ -63,9 +64,6 @@ JNIEXPORT jlong JNICALL Java_org_apache_arrow_plasma_PlasmaClientJNI_connect(
   plasma::PlasmaClient* client = new plasma::PlasmaClient();
   ARROW_CHECK_OK(client->Connect(s_name, m_name, release_delay));
 
-  // fprintf (stdout, "JNI plasma client init, fd = %d\n", client->get_store_fd());
-  // fflush (stdout);
-
   env->ReleaseStringUTFChars(store_socket_name, s_name);
   env->ReleaseStringUTFChars(manager_socket_name, m_name);
   return reinterpret_cast<int64_t>(client);
@@ -75,9 +73,6 @@ JNIEXPORT void JNICALL Java_org_apache_arrow_plasma_PlasmaClientJNI_disconnect(
     JNIEnv* env, jclass cls, jlong conn) {
   plasma::PlasmaClient* client = (plasma::PlasmaClient*)conn;
 
-  // fprintf (stdout, "JNI plasma client disconnect, fd = %d\n", client->get_store_fd());
-  // fflush (stdout);
-
   ARROW_CHECK_OK(client->Disconnect());
   delete client;
   return;
@@ -154,17 +149,12 @@ JNIEXPORT void JNICALL Java_org_apache_arrow_plasma_PlasmaClientJNI_release(
   plasma::ObjectID oid;
   jbyteArray_to_object_id(env, object_id, &oid);
 
-  // fprintf (stdout, "JNI plasma client release, fd = %d\n", client->get_store_fd());
-  // fflush (stdout);
-
   ARROW_CHECK_OK(client->Release(oid));
 }
 
 JNIEXPORT jobjectArray JNICALL Java_org_apache_arrow_plasma_PlasmaClientJNI_get(
     JNIEnv* env, jclass cls, jlong conn, jobjectArray object_ids, jint timeout_ms) {
   plasma::PlasmaClient* client = (plasma::PlasmaClient*)conn;
-  // fprintf (stdout, "JNI plasma client get, fd = %d\n", client->get_store_fd());
-  // fflush (stdout);
 
   jsize num_oids = env->GetArrayLength(object_ids);
   std::vector<plasma::ObjectID> oids(num_oids);

java/plasma/README.md

@@ -17,11 +17,11 @@
   under the License.
 -->
 
-# Plasma client of java
+# Java Plasma Client
 
 ## Setup Build Environment
 
-install:
+Install:
  - java 8 or later
  - maven 3.3 or later
  - the same requirement of build [Arrow C++](https://github.com/apache/arrow/tree/master/cpp)
@@ -36,4 +36,3 @@ mvn clean install -Dmaven.test.skip
 ```
 ./test.sh
 ```
-

java/plasma/src/main/java/org/apache/arrow/plasma/ObjectStoreLink.java

@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.arrow.plasma;
 
 import java.util.List;

java/plasma/src/main/java/org/apache/arrow/plasma/PlasmaClientJNI.java

@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.arrow.plasma;
 
 import java.nio.ByteBuffer;

java/plasma/src/test/java/org/apache/arrow/plasma/PlasmaClientTest.java

@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.arrow.plasma;
 
 import java.io.IOException;

java/plasma/test.sh

@@ -15,6 +15,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+
 ROOT_DIR=$(cd "$(dirname "${BASH_SOURCE:-$0}")"; pwd)
 unamestr="$(uname)"
 if [[ "$unamestr" == "Linux" ]]; then
@@ -35,7 +36,7 @@ pushd ../../cpp
             -DCMAKE_CXX_FLAGS="-g -O3" \
             -DARROW_BUILD_TESTS=off \
             -DARROW_HDFS=on \
-            -DARROW_BOOST_USE_SHARED=off \
+            -DARROW_BOOST_USE_SHARED=on \
             -DARROW_PYTHON=on \
             -DARROW_PLASMA=on \
             -DPLASMA_PYTHON=on \