Skip to content

ARROW-4249: [Plasma] Clean up client namespace #3392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
pcmoritz wants to merge 2 commits into from
Closed

ARROW-4249: [Plasma] Clean up client namespace #3392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2a215a
remove arrow/util/logging.h from plasma/common.h
pcmoritz Jan 13, 2019
3b5473a
add more includes
pcmoritz Jan 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion cpp/src/plasma/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
#include "plasma/compat.h"

#include "arrow/status.h"
#include "arrow/util/logging.h"
#ifdef PLASMA_CUDA
#include "arrow/gpu/cuda_api.h"
#endif
Expand Down
1 change: 1 addition & 0 deletions cpp/src/plasma/io.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <sstream>

#include "arrow/status.h"
#include "arrow/util/logging.h"

#include "plasma/common.h"
#include "plasma/plasma_generated.h"
Expand Down
2 changes: 2 additions & 0 deletions cpp/src/plasma/lib/java/org_apache_arrow_plasma_PlasmaClientJNI.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
#include <string>
#include <vector>

#include "arrow/util/logging.h"

#include "plasma/client.h"

constexpr jsize OBJECT_ID_SIZE = sizeof(plasma::ObjectID) / sizeof(jbyte);
Expand Down
1 change: 1 addition & 0 deletions python/pyarrow/tensorflow/plasma_op.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include "arrow/adapters/tensorflow/convert.h"
#include "arrow/api.h"
#include "arrow/io/api.h"
#include "arrow/util/logging.h"

@pitrou pitrou Jan 15, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pcmoritz Would you know why plasma_op.cc includes Tensorflow's logging.h above? It produces a collision in the DCHECK macros.

@wesm wesm Jan 15, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

where is the DCHECK collision occurring? Are we clobbering their macro or vice versa? We should use ARROW_CHECK (or add ARROW_DCHECK_* aliases) so we can use these in an environment where there is ambiguity. We already disallow DCHECK in public headers

@pitrou pitrou Jan 15, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See line 22 above:

#include "tensorflow/core/platform/logging.h"


// These headers do not include Python.h
#include "arrow/python/deserialize.h"
Expand Down