You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by pc...@apache.org on 2018/05/19 02:25:19 UTC
[arrow] branch master updated: ARROW-2612: [Plasma] Fix deprecated
PLASMA_DEFAULT_RELEASE_DELAY
This is an automated email from the ASF dual-hosted git repository.
pcmoritz 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 bd25a65 ARROW-2612: [Plasma] Fix deprecated PLASMA_DEFAULT_RELEASE_DELAY
bd25a65 is described below
commit bd25a655b2a3759db02def9cdddda5f8afb20f59
Author: Philipp Moritz <pc...@gmail.com>
AuthorDate: Fri May 18 19:25:10 2018 -0700
ARROW-2612: [Plasma] Fix deprecated PLASMA_DEFAULT_RELEASE_DELAY
Author: Philipp Moritz <pc...@gmail.com>
Closes #2063 from pcmoritz/fix-plasma-deprecated-const and squashes the following commits:
b6e92f67 <Philipp Moritz> fix test
5e1d82b7 <Philipp Moritz> add test
469b59a6 <Philipp Moritz> fix deprecated PLASMA_DEFAULT_RELEASE_DELAY
---
cpp/src/plasma/client.h | 2 +-
cpp/src/plasma/test/client_tests.cc | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/cpp/src/plasma/client.h b/cpp/src/plasma/client.h
index 4e1ff4a..c3b5548 100644
--- a/cpp/src/plasma/client.h
+++ b/cpp/src/plasma/client.h
@@ -36,7 +36,7 @@ namespace plasma {
ARROW_DEPRECATED("PLASMA_DEFAULT_RELEASE_DELAY is deprecated")
constexpr int64_t kDeprecatedPlasmaDefaultReleaseDelay = 64;
-#define PLASMA_DEFAULT_RELEASE_DELAY kDeprecatedPlasmaDefaultReleaseDelay;
+#define PLASMA_DEFAULT_RELEASE_DELAY plasma::kDeprecatedPlasmaDefaultReleaseDelay
/// We keep a queue of unreleased objects cached in the client until we start
/// sending release requests to the store. This is to avoid frequently mapping
diff --git a/cpp/src/plasma/test/client_tests.cc b/cpp/src/plasma/test/client_tests.cc
index 23d2c2b..fa7de04 100644
--- a/cpp/src/plasma/test/client_tests.cc
+++ b/cpp/src/plasma/test/client_tests.cc
@@ -430,6 +430,13 @@ TEST_F(TestPlasmaStore, ManyObjectTest) {
}
}
+#ifndef ARROW_NO_DEPRECATED_API
+TEST_F(TestPlasmaStore, DeprecatedApiTest) {
+ int64_t default_delay = PLASMA_DEFAULT_RELEASE_DELAY;
+ ARROW_CHECK(default_delay == plasma::kPlasmaDefaultReleaseDelay);
+}
+#endif // ARROW_NO_DEPRECATED_API
+
#ifdef PLASMA_GPU
using arrow::gpu::CudaBuffer;
using arrow::gpu::CudaBufferReader;
--
To stop receiving notification emails like this one, please contact
pcmoritz@apache.org.