Remove AxesIteratorHandle and related axes iterator functionality

Author: Choochmeque

rust/crates/fdb-sys/cpp/fdb_bridge.cpp

@@ -620,58 +620,6 @@ MoveElementData MoveIteratorHandle::next() {
     return data;
 }
 
-// ============================================================================
-// AxesIteratorHandle implementation
-// ============================================================================
-
-AxesIteratorHandle::AxesIteratorHandle(fdb5::AxesIterator&& it) : impl_(std::move(it)) {}
-
-AxesIteratorHandle::~AxesIteratorHandle() = default;
-
-bool AxesIteratorHandle::hasNext() {
-    if (exhausted_) {
-        return false;
-    }
-    if (has_current_) {
-        return true;
-    }
-
-    if (impl_.next(current_)) {
-        has_current_ = true;
-        return true;
-    }
-    else {
-        exhausted_ = true;
-        return false;
-    }
-}
-
-AxesElementData AxesIteratorHandle::next() {
-    if (!has_current_ && !hasNext()) {
-        throw std::runtime_error("Iterator exhausted");
-    }
-
-    has_current_ = false;
-
-    AxesElementData data;
-
-    // Extract the database key
-    data.db_key = from_fdb_key(current_.key());
-
-    // Extract all axes from the IndexAxis
-    auto axes_map = current_.axes().map();
-    for (const auto& [axis_name, values_set] : axes_map) {
-        AxisEntry entry;
-        entry.key = rust::String(axis_name);
-        for (const auto& v : values_set) {
-            entry.values.push_back(rust::String(v));
-        }
-        data.axes.push_back(std::move(entry));
-    }
-
-    return data;
-}
-
 // ============================================================================
 // Library metadata functions
 // ============================================================================
@@ -787,13 +735,6 @@ rust::Vec<AxisEntry> axes(FdbHandle& handle, rust::Str request, int32_t level) {
     return result;
 }
 
-std::unique_ptr<AxesIteratorHandle> axes_iterator(FdbHandle& handle, rust::Str request, int32_t level) {
-    std::string request_str{request};
-    auto tool_request = make_tool_request(request_str);
-    auto it = handle.inner().axesIterator(tool_request, level);
-    return std::make_unique<AxesIteratorHandle>(std::move(it));
-}
-
 // ============================================================================
 // Dump functions
 // ============================================================================

rust/crates/fdb-sys/cpp/fdb_bridge.h

@@ -57,7 +57,6 @@ catch (...) {
 }  // namespace rust::behavior
 
 #include "fdb5/api/FDB.h"
-#include "fdb5/api/helpers/AxesIterator.h"
 #include "fdb5/api/helpers/ControlIterator.h"
 #include "fdb5/api/helpers/DumpIterator.h"
 #include "fdb5/api/helpers/ListIterator.h"
@@ -89,7 +88,6 @@ struct StatsElementData;
 struct ControlElementData;
 struct MoveElementData;
 struct ConfigData;
-struct AxesElementData;
 
 // ============================================================================
 // Wrapper classes for opaque C++ types
@@ -388,30 +386,6 @@ class MoveIteratorHandle {
     bool exhausted_ = false;
 };
 
-/// Wrapper around fdb5::AxesIterator.
-class AxesIteratorHandle {
-public:
-
-    explicit AxesIteratorHandle(fdb5::AxesIterator&& it);
-    ~AxesIteratorHandle();
-
-    AxesIteratorHandle(const AxesIteratorHandle&) = delete;
-    AxesIteratorHandle& operator=(const AxesIteratorHandle&) = delete;
-    AxesIteratorHandle(AxesIteratorHandle&&) = default;
-    AxesIteratorHandle& operator=(AxesIteratorHandle&&) = default;
-
-    // Methods exposed to Rust via cxx
-    bool hasNext();
-    AxesElementData next();
-
-private:
-
-    fdb5::AxesIterator impl_;
-    fdb5::AxesElement current_;
-    bool has_current_ = false;
-    bool exhausted_ = false;
-};
-
 // ============================================================================
 // Initialization functions
 // ============================================================================
@@ -490,9 +464,6 @@ std::unique_ptr<ListIteratorHandle> list(FdbHandle& handle, rust::Str request, b
 /// Get axes for a request.
 rust::Vec<AxisEntry> axes(FdbHandle& handle, rust::Str request, int32_t level);
 
-/// Get an axes iterator.
-std::unique_ptr<AxesIteratorHandle> axes_iterator(FdbHandle& handle, rust::Str request, int32_t level);
-
 // ============================================================================
 // Dump functions
 // ============================================================================

rust/crates/fdb-sys/src/lib.rs

@@ -39,7 +39,10 @@ pub struct FlushCallbackBox(Box<dyn FlushCallback>);
 /// Opaque wrapper for archive callbacks (used internally by cxx bridge).
 pub struct ArchiveCallbackBox(Box<dyn ArchiveCallback>);
 
-#[track_cpp_api("fdb5/api/FDB.h", class = "FDB", ignore = ["inspect", "reindex"])]
+// `axesIterator` is intentionally not exposed: it is an internal detail of
+// the multi-FDB implementation (DistFDB / SelectFDB) and not meaningful at
+// the user API. The synchronous `axes()` method is the supported entry point.
+#[track_cpp_api("fdb5/api/FDB.h", class = "FDB", ignore = ["inspect", "reindex", "axesIterator"])]
 #[cxx::bridge(namespace = "fdb::ffi")]
 mod ffi {
     // =========================================================================
@@ -94,15 +97,6 @@ mod ffi {
         pub values: Vec<String>,
     }
 
-    /// Data from axes iteration - contains a database key and all its axes.
-    #[derive(Debug, Clone, Default)]
-    pub struct AxesElementData {
-        /// Database key entries
-        pub db_key: Vec<KeyValue>,
-        /// All axes for this database
-        pub axes: Vec<AxisEntry>,
-    }
-
     /// Aggregate FDB statistics.
     #[derive(Debug, Clone, Default)]
     pub struct FdbStatsData {
@@ -398,19 +392,6 @@ mod ffi {
         /// Get the next element from the iterator.
         fn next(self: Pin<&mut MoveIteratorHandle>) -> Result<MoveElementData>;
 
-        // =====================================================================
-        // AxesIteratorHandle
-        // =====================================================================
-
-        /// Wrapper around fdb5::AxesIterator
-        type AxesIteratorHandle;
-
-        /// Check if the iterator has more elements.
-        fn hasNext(self: Pin<&mut AxesIteratorHandle>) -> Result<bool>;
-
-        /// Get the next element from the iterator.
-        fn next(self: Pin<&mut AxesIteratorHandle>) -> Result<AxesElementData>;
-
         // =====================================================================
         // Initialization (free functions)
         // =====================================================================
@@ -506,13 +487,6 @@ mod ffi {
         /// Get axes (available metadata dimensions) for a request.
         fn axes(handle: Pin<&mut FdbHandle>, request: &str, level: i32) -> Result<Vec<AxisEntry>>;
 
-        /// Get an axes iterator for streaming axes results.
-        fn axes_iterator(
-            handle: Pin<&mut FdbHandle>,
-            request: &str,
-            level: i32,
-        ) -> Result<UniquePtr<AxesIteratorHandle>>;
-
         // =====================================================================
         // Dump operations (free functions)
         // =====================================================================

rust/crates/fdb/src/handle.rs

@@ -10,8 +10,8 @@ use parking_lot::Mutex;
 use crate::datareader::DataReader;
 use crate::error::Result;
 use crate::iterator::{
-    AxesIterator, ControlIterator, DumpIterator, ListIterator, MoveIterator, PurgeIterator,
-    StatsIterator, StatusIterator, WipeIterator,
+    ControlIterator, DumpIterator, ListIterator, MoveIterator, PurgeIterator, StatsIterator,
+    StatusIterator, WipeIterator,
 };
 use crate::key::Key;
 use crate::request::Request;
@@ -320,22 +320,6 @@ impl Fdb {
         Ok(axes.into_iter().map(|a| (a.key, a.values)).collect())
     }
 
-    /// Get an axes iterator for streaming axes results.
-    ///
-    /// # Arguments
-    ///
-    /// * `request` - The request to query axes for
-    /// * `depth` - Index depth to traverse (1=database, 2=index, 3=full)
-    ///
-    /// # Errors
-    ///
-    /// Returns an error if the query fails.
-    pub fn axes_iter(&self, request: &Request, depth: i32) -> Result<AxesIterator> {
-        let it =
-            self.with_handle(|h| fdb_sys::axes_iterator(h, &request.to_request_string(), depth))?;
-        Ok(AxesIterator::new(it))
-    }
-
     /// Dump database structure.
     ///
     /// # Arguments

rust/crates/fdb/src/iterator.rs

@@ -1,7 +1,5 @@
 //! FDB iterator wrappers.
 
-use std::collections::HashMap;
-
 use fdb_sys::UniquePtr;
 
 use crate::error::Result;
@@ -123,81 +121,6 @@ impl ListElement {
     }
 }
 
-// =============================================================================
-// AxesIterator
-// =============================================================================
-
-/// An iterator over FDB axes results.
-pub struct AxesIterator {
-    handle: UniquePtr<fdb_sys::AxesIteratorHandle>,
-    exhausted: bool,
-}
-
-impl AxesIterator {
-    /// Create a new iterator from a cxx handle.
-    pub(crate) const fn new(handle: UniquePtr<fdb_sys::AxesIteratorHandle>) -> Self {
-        Self {
-            handle,
-            exhausted: false,
-        }
-    }
-}
-
-impl Iterator for AxesIterator {
-    type Item = Result<AxesElement>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if self.exhausted {
-            return None;
-        }
-        match self.handle.pin_mut().hasNext() {
-            Ok(false) => {
-                self.exhausted = true;
-                return None;
-            }
-            Err(e) => {
-                self.exhausted = true;
-                return Some(Err(e.into()));
-            }
-            Ok(true) => {}
-        }
-
-        match self.handle.pin_mut().next() {
-            Ok(data) => Some(Ok(AxesElement::from_cxx(data))),
-            Err(e) => {
-                self.exhausted = true;
-                Some(Err(e.into()))
-            }
-        }
-    }
-}
-
-// SAFETY: AxesIterator can be sent to another thread because:
-// 1. The C++ fdb5::AxesIterator contains a snapshot of index data taken at construction
-// 2. It does not hold references back to the FDB handle after creation
-// 3. Access is exclusive via &mut self (Pin<&mut> in the FFI layer)
-// 4. The iterator has no thread-local state or thread-affine resources
-#[allow(clippy::non_send_fields_in_send_ty)]
-unsafe impl Send for AxesIterator {}
-
-/// An axes element containing database key and available axes.
-#[derive(Debug, Clone)]
-pub struct AxesElement {
-    /// Database-level key entries.
-    pub db_key: Vec<(String, String)>,
-    /// Available axes (key -> values mapping).
-    pub axes: HashMap<String, Vec<String>>,
-}
-
-impl AxesElement {
-    fn from_cxx(data: fdb_sys::AxesElementData) -> Self {
-        Self {
-            db_key: key_values_to_vec(data.db_key),
-            axes: data.axes.into_iter().map(|a| (a.key, a.values)).collect(),
-        }
-    }
-}
-
 // =============================================================================
 // DumpIterator
 // =============================================================================

rust/crates/fdb/src/lib.rs

@@ -33,9 +33,9 @@ pub use datareader::DataReader;
 pub use error::{Error, Result};
 pub use handle::{ArchiveCallbackData, Fdb, FdbConfig, FdbStats};
 pub use iterator::{
-    AxesElement, AxesIterator, ControlElement, ControlIterator, DumpElement, DumpIterator,
-    ListElement, ListIterator, MoveElement, MoveIterator, PurgeElement, PurgeIterator,
-    StatsElement, StatsIterator, StatusElement, StatusIterator, WipeElement, WipeIterator,
+    ControlElement, ControlIterator, DumpElement, DumpIterator, ListElement, ListIterator,
+    MoveElement, MoveIterator, PurgeElement, PurgeIterator, StatsElement, StatsIterator,
+    StatusElement, StatusIterator, WipeElement, WipeIterator,
 };
 pub use key::Key;
 pub use request::Request;