Guard ChunkResolver use in altrep.cpp

apache · Oct 17, 2024 · d2d29b0 · d2d29b0
1 parent 3646d0f
commit d2d29b0
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/r/src/altrep.cpp b/r/src/altrep.cpp
@@ -80,18 +80,26 @@ void DeletePointer(std::shared_ptr<T>* ptr) {
 template <typename T>
 using Pointer = cpp11::external_pointer<std::shared_ptr<T>, DeletePointer<T>>;
 
+#if ARROW_MAJOR_VERSION >= 18
+using ChunkResolver = arrow::ChunkResolver;
+using ChunkLocation = arrow::ChunkLocation;
+#else
+using ChunkResolver = arrow::internal::ChunkResolver;
+using ChunkLocation = arrow::internal::ChunkLocation;
+#endif
+
 class ArrowAltrepData {
  public:
   explicit ArrowAltrepData(const std::shared_ptr<ChunkedArray>& chunked_array)
       : chunked_array_(chunked_array), resolver_(chunked_array->chunks()) {}
 
   const std::shared_ptr<ChunkedArray>& chunked_array() { return chunked_array_; }
 
-  arrow::ChunkLocation locate(int64_t index) { return resolver_.Resolve(index); }
+  ChunkLocation locate(int64_t index) { return resolver_.Resolve(index); }
 
  private:
   std::shared_ptr<ChunkedArray> chunked_array_;
-  arrow::ChunkResolver resolver_;
+  ChunkResolver resolver_;
 };
 
 // the ChunkedArray that is being wrapped by the altrep object