fix python extension

pcmoritz · pcmoritz · commit e7badc48ab4d · 2017-06-19T19:55:39.000-07:00
diff --git a/cpp/src/plasma/extension.cc b/cpp/src/plasma/extension.cc
@@ -193,7 +193,7 @@ PyObject* PyPlasma_contains(PyObject* self, PyObject* args) {
           &object_id)) {
     return NULL;
   }
-  int has_object;
+  bool has_object;
   ARROW_CHECK_OK(client->Contains(object_id, &has_object));
 
   if (has_object)
@@ -208,7 +208,7 @@ PyObject* PyPlasma_fetch(PyObject* self, PyObject* args) {
   if (!PyArg_ParseTuple(args, "O&O", PyObjectToPlasmaClient, &client, &object_id_list)) {
     return NULL;
   }
-  if (!plasma_manager_is_connected(client)) {
+  if (client->get_manager_fd() == -1) {
     PyErr_SetString(PyExc_RuntimeError, "Not connected to the plasma manager");
     return NULL;
   }
@@ -233,7 +233,7 @@ PyObject* PyPlasma_wait(PyObject* self, PyObject* args) {
   }
   Py_ssize_t n = PyList_Size(object_id_list);
 
-  if (!plasma_manager_is_connected(client)) {
+  if (client->get_manager_fd() == -1) {
     PyErr_SetString(PyExc_RuntimeError, "Not connected to the plasma manager");
     return NULL;
   }
@@ -265,7 +265,7 @@ PyObject* PyPlasma_wait(PyObject* self, PyObject* args) {
   int num_return_objects;
   Py_BEGIN_ALLOW_THREADS;
   ARROW_CHECK_OK(
-      client->Wait(n, object_requests.data(), num_returns, timeout, num_return_objects));
+      client->Wait(n, object_requests.data(), num_returns, timeout, &num_return_objects));
   Py_END_ALLOW_THREADS;
 
   int num_to_return = std::min(num_return_objects, num_returns);
@@ -326,7 +326,7 @@ PyObject* PyPlasma_transfer(PyObject* self, PyObject* args) {
     return NULL;
   }
 
-  if (!plasma_manager_is_connected(client)) {
+  if (client->get_manager_fd() == -1) {
     PyErr_SetString(PyExc_RuntimeError, "Not connected to the plasma manager");
     return NULL;
   }
@@ -340,7 +340,7 @@ PyObject* PyPlasma_subscribe(PyObject* self, PyObject* args) {
   if (!PyArg_ParseTuple(args, "O&", PyObjectToPlasmaClient, &client)) { return NULL; }
 
   int sock;
-  ARROW_CHECK_OK(client->Subscribe(sock));
+  ARROW_CHECK_OK(client->Subscribe(&sock));
   return PyLong_FromLong(sock);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ PyObject* PyPlasma_contains(PyObject* self, PyObject* args) {`
`193`	`193`	`&object_id)) {`
`194`	`194`	`return NULL;`
`195`	`195`	`}`
`196`		`- int has_object;`
	`196`	`+ bool has_object;`
`197`	`197`	`ARROW_CHECK_OK(client->Contains(object_id, &has_object));`
`198`	`198`
`199`	`199`	`if (has_object)`
`@@ -208,7 +208,7 @@ PyObject* PyPlasma_fetch(PyObject* self, PyObject* args) {`
`208`	`208`	`if (!PyArg_ParseTuple(args, "O&O", PyObjectToPlasmaClient, &client, &object_id_list)) {`
`209`	`209`	`return NULL;`
`210`	`210`	`}`
`211`		`- if (!plasma_manager_is_connected(client)) {`
	`211`	`+ if (client->get_manager_fd() == -1) {`
`212`	`212`	`PyErr_SetString(PyExc_RuntimeError, "Not connected to the plasma manager");`
`213`	`213`	`return NULL;`
`214`	`214`	`}`
`@@ -233,7 +233,7 @@ PyObject* PyPlasma_wait(PyObject* self, PyObject* args) {`
`233`	`233`	`}`
`234`	`234`	`Py_ssize_t n = PyList_Size(object_id_list);`
`235`	`235`
`236`		`- if (!plasma_manager_is_connected(client)) {`
	`236`	`+ if (client->get_manager_fd() == -1) {`
`237`	`237`	`PyErr_SetString(PyExc_RuntimeError, "Not connected to the plasma manager");`
`238`	`238`	`return NULL;`
`239`	`239`	`}`
`@@ -265,7 +265,7 @@ PyObject* PyPlasma_wait(PyObject* self, PyObject* args) {`
`265`	`265`	`int num_return_objects;`
`266`	`266`	`Py_BEGIN_ALLOW_THREADS;`
`267`	`267`	`ARROW_CHECK_OK(`
`268`		`- client->Wait(n, object_requests.data(), num_returns, timeout, num_return_objects));`
	`268`	`+ client->Wait(n, object_requests.data(), num_returns, timeout, &num_return_objects));`
`269`	`269`	`Py_END_ALLOW_THREADS;`
`270`	`270`
`271`	`271`	`int num_to_return = std::min(num_return_objects, num_returns);`
`@@ -326,7 +326,7 @@ PyObject* PyPlasma_transfer(PyObject* self, PyObject* args) {`
`326`	`326`	`return NULL;`
`327`	`327`	`}`
`328`	`328`
`329`		`- if (!plasma_manager_is_connected(client)) {`
	`329`	`+ if (client->get_manager_fd() == -1) {`
`330`	`330`	`PyErr_SetString(PyExc_RuntimeError, "Not connected to the plasma manager");`
`331`	`331`	`return NULL;`
`332`	`332`	`}`
`@@ -340,7 +340,7 @@ PyObject* PyPlasma_subscribe(PyObject* self, PyObject* args) {`
`340`	`340`	`if (!PyArg_ParseTuple(args, "O&", PyObjectToPlasmaClient, &client)) { return NULL; }`
`341`	`341`
`342`	`342`	`int sock;`
`343`		`- ARROW_CHECK_OK(client->Subscribe(sock));`
	`343`	`+ ARROW_CHECK_OK(client->Subscribe(&sock));`
`344`	`344`	`return PyLong_FromLong(sock);`
`345`	`345`	`}`
`346`	`346`