ARROW-2612: [Plasma] Fix deprecated PLASMA_DEFAULT_RELEASE_DELAY

Author: Philipp Moritz <[email protected]> Closes apache#2063 from pcmoritz/fix-plasma-deprecated-const and squashes the following commits: b6e92f6 <Philipp Moritz> fix test 5e1d82b <Philipp Moritz> add test 469b59a <Philipp Moritz> fix deprecated PLASMA_DEFAULT_RELEASE_DELAY
khwilson · May 19, 2018 · bd25a65 · bd25a65
1 parent 3d41978
commit bd25a65
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git 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
@@ -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;