Remove FDB configuration methods and related data structures to simplify API

Author: Choochmeque

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

@@ -174,47 +174,6 @@ rust::String FdbHandle::name() const {
     return rust::String(impl_.name());
 }
 
-ConfigData FdbHandle::config() const {
-    ConfigData data;
-    const auto& cfg = impl_.config();
-    data.schema_path = rust::String(cfg.schemaPath().asString());
-    data.config_path = rust::String(cfg.configPath().asString());
-    return data;
-}
-
-rust::String FdbHandle::config_string(rust::Str key) const {
-    const auto& cfg = impl_.config();
-    std::string key_str{key};
-    if (cfg.has(key_str)) {
-        return rust::String(cfg.getString(key_str));
-    }
-    return rust::String("");
-}
-
-int64_t FdbHandle::config_int(rust::Str key) const {
-    const auto& cfg = impl_.config();
-    std::string key_str{key};
-    if (cfg.has(key_str)) {
-        return cfg.getLong(key_str);
-    }
-    return 0;
-}
-
-bool FdbHandle::config_bool(rust::Str key) const {
-    const auto& cfg = impl_.config();
-    std::string key_str{key};
-    if (cfg.has(key_str)) {
-        return cfg.getBool(key_str);
-    }
-    return false;
-}
-
-bool FdbHandle::config_has(rust::Str key) const {
-    const auto& cfg = impl_.config();
-    std::string key_str{key};
-    return cfg.has(key_str);
-}
-
 // ============================================================================
 // DataReaderHandle implementation
 // ============================================================================

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

@@ -87,7 +87,6 @@ struct PurgeElementData;
 struct StatsElementData;
 struct ControlElementData;
 struct MoveElementData;
-struct ConfigData;
 
 // ============================================================================
 // Wrapper classes for opaque C++ types
@@ -136,21 +135,6 @@ class FdbHandle {
     /// Get the FDB type name.
     rust::String name() const;
 
-    /// Get the FDB configuration data.
-    ConfigData config() const;
-
-    /// Get a string value from the FDB configuration.
-    rust::String config_string(rust::Str key) const;
-
-    /// Get an integer value from the FDB configuration.
-    int64_t config_int(rust::Str key) const;
-
-    /// Get a boolean value from the FDB configuration.
-    bool config_bool(rust::Str key) const;
-
-    /// Check if a key exists in the FDB configuration.
-    bool config_has(rust::Str key) const;
-
 private:
 
     fdb5::FDB impl_;

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

@@ -39,10 +39,18 @@ pub struct FlushCallbackBox(Box<dyn FlushCallback>);
 /// Opaque wrapper for archive callbacks (used internally by cxx bridge).
 pub struct ArchiveCallbackBox(Box<dyn ArchiveCallback>);
 
-// `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"])]
+// Methods intentionally not exposed:
+// - `axesIterator`: internal detail of the multi-FDB implementation
+//   (DistFDB / SelectFDB), not meaningful at the user API. The synchronous
+//   `axes()` method is the supported entry point.
+// - `config`: returns the same configuration the user just supplied to
+//   `Fdb::from_yaml(...)`. The user already has it; round-tripping it back
+//   through the FFI adds no information.
+#[track_cpp_api(
+    "fdb5/api/FDB.h",
+    class = "FDB",
+    ignore = ["inspect", "reindex", "axesIterator", "config"]
+)]
 #[cxx::bridge(namespace = "fdb::ffi")]
 mod ffi {
     // =========================================================================
@@ -171,15 +179,6 @@ mod ffi {
         pub destination: String,
     }
 
-    /// FDB configuration data.
-    #[derive(Debug, Clone, Default)]
-    pub struct ConfigData {
-        /// Path to the schema file.
-        pub schema_path: String,
-        /// Path to the config file.
-        pub config_path: String,
-    }
-
     // Bind to existing fdb5::ControlAction / fdb5::ControlIdentifier C++ enums.
     // The shared enum + extern type pattern tells CXX to use the existing
     // C++ enum and generate static assertions to verify the values match.
@@ -248,21 +247,6 @@ mod ffi {
         /// Get the FDB type name (e.g., "local", "remote").
         fn name(self: &FdbHandle) -> String;
 
-        /// Get the FDB configuration data (schema path, config path).
-        fn config(self: &FdbHandle) -> ConfigData;
-
-        /// Get a string value from the FDB configuration.
-        fn config_string(self: &FdbHandle, key: &str) -> String;
-
-        /// Get an integer value from the FDB configuration.
-        fn config_int(self: &FdbHandle, key: &str) -> i64;
-
-        /// Get a boolean value from the FDB configuration.
-        fn config_bool(self: &FdbHandle, key: &str) -> bool;
-
-        /// Check if a key exists in the FDB configuration.
-        fn config_has(self: &FdbHandle, key: &str) -> bool;
-
         // =====================================================================
         // DataReaderHandle - For reading retrieved data
         // =====================================================================

rust/crates/fdb/src/handle.rs

@@ -461,60 +461,6 @@ impl Fdb {
         self.with_handle_ref(|h| h.enabled(identifier))
     }
 
-    /// Get the FDB configuration data.
-    #[must_use]
-    pub fn config(&self) -> FdbConfig {
-        self.with_handle_ref(|h| {
-            let data = h.config();
-            FdbConfig {
-                schema_path: data.schema_path,
-                config_path: data.config_path,
-            }
-        })
-    }
-
-    /// Get a string value from the FDB configuration.
-    ///
-    /// Returns `None` if the key doesn't exist.
-    #[must_use]
-    pub fn config_string(&self, key: &str) -> Option<String> {
-        if self.config_has(key) {
-            Some(self.with_handle_ref(|h| h.config_string(key)))
-        } else {
-            None
-        }
-    }
-
-    /// Get an integer value from the FDB configuration.
-    ///
-    /// Returns `None` if the key doesn't exist.
-    #[must_use]
-    pub fn config_int(&self, key: &str) -> Option<i64> {
-        if self.config_has(key) {
-            Some(self.with_handle_ref(|h| h.config_int(key)))
-        } else {
-            None
-        }
-    }
-
-    /// Get a boolean value from the FDB configuration.
-    ///
-    /// Returns `None` if the key doesn't exist.
-    #[must_use]
-    pub fn config_bool(&self, key: &str) -> Option<bool> {
-        if self.config_has(key) {
-            Some(self.with_handle_ref(|h| h.config_bool(key)))
-        } else {
-            None
-        }
-    }
-
-    /// Check if a key exists in the FDB configuration.
-    #[must_use]
-    pub fn config_has(&self, key: &str) -> bool {
-        self.with_handle_ref(|h| h.config_has(key))
-    }
-
     /// Register a callback to be invoked on flush.
     pub fn on_flush<F>(&self, callback: F)
     where
@@ -551,14 +497,5 @@ pub struct FdbStats {
     pub num_flush: u64,
 }
 
-/// FDB configuration data.
-#[derive(Debug, Clone, Default)]
-pub struct FdbConfig {
-    /// Path to the schema file.
-    pub schema_path: String,
-    /// Path to the config file.
-    pub config_path: String,
-}
-
 /// Re-export callback data type.
 pub use fdb_sys::ArchiveCallbackData;

rust/crates/fdb/src/lib.rs

@@ -31,7 +31,7 @@ mod request;
 
 pub use datareader::DataReader;
 pub use error::{Error, Result};
-pub use handle::{ArchiveCallbackData, Fdb, FdbConfig, FdbStats};
+pub use handle::{ArchiveCallbackData, Fdb, FdbStats};
 pub use iterator::{
     ControlElement, ControlIterator, DumpElement, DumpIterator, ListElement, ListIterator,
     MoveElement, MoveIterator, PurgeElement, PurgeIterator, StatsElement, StatsIterator,

rust/crates/fdb/tests/fdb_integration.rs

@@ -526,29 +526,16 @@ fn test_fdb_dirty_flag() {
 
 #[test]
 #[ignore = "requires FDB libraries"]
-fn test_fdb_config_methods() {
+fn test_fdb_id_and_name() {
     let tmpdir = tempfile::tempdir().expect("failed to create temp dir");
     let config = create_test_config(tmpdir.path());
 
     let fdb = Fdb::from_yaml(&config).expect("failed to create FDB from YAML");
 
-    // Test config()
-    let cfg = fdb.config();
-    println!(
-        "Config: schema_path={}, config_path={}",
-        cfg.schema_path, cfg.config_path
-    );
-
-    // Test id() and name()
     let id = fdb.id();
     let name = fdb.name();
     println!("FDB id={id}, name={name}");
     assert!(!name.is_empty(), "expected non-empty FDB name");
-
-    // Test config_has
-    // Note: available keys depend on the configuration
-    let has_type = fdb.config_has("type");
-    println!("config_has('type') = {has_type}");
 }
 
 #[test]
@@ -960,14 +947,10 @@ spaces:
 
     let fdb = Fdb::from_yaml(&config).expect("failed to create FDB from YAML");
 
-    // Verify config was parsed
+    // Verify the FDB handle came up cleanly with the YAML we built.
     let name = fdb.name();
     assert!(!name.is_empty(), "expected non-empty FDB name");
     println!("FDB type/name: {name}");
-
-    // Test config accessors
-    let has_type = fdb.config_has("type");
-    println!("config_has('type') = {has_type}");
 }
 
 #[test]
@@ -1226,36 +1209,6 @@ fn test_fdb_control_lock_unlock() {
     }
 }
 
-#[test]
-#[ignore = "requires FDB libraries"]
-fn test_fdb_config_accessors() {
-    let tmpdir = tempfile::tempdir().expect("failed to create temp dir");
-    let config = create_test_config(tmpdir.path());
-
-    let fdb = Fdb::from_yaml(&config).expect("failed to create FDB from YAML");
-
-    // Test config_string - try to get a string config value
-    let type_str = fdb.config_string("type");
-    println!("config_string('type') = {type_str:?}");
-
-    // Test config_int - returns None if key doesn't exist
-    let some_int = fdb.config_int("nonexistent_key");
-    assert!(some_int.is_none(), "nonexistent key should return None");
-    println!("config_int('nonexistent_key') = {some_int:?}");
-
-    // Test config_bool - returns None if key doesn't exist
-    let some_bool = fdb.config_bool("nonexistent_key");
-    assert!(some_bool.is_none(), "nonexistent key should return None");
-    println!("config_bool('nonexistent_key') = {some_bool:?}");
-
-    // Test config_has for various keys
-    let has_type = fdb.config_has("type");
-    let has_schema = fdb.config_has("schema");
-    let has_nonexistent = fdb.config_has("definitely_not_a_key");
-    println!("config_has: type={has_type}, schema={has_schema}, nonexistent={has_nonexistent}");
-    assert!(!has_nonexistent, "nonexistent key should return false");
-}
-
 #[test]
 #[ignore = "requires FDB libraries"]
 fn test_fdb_enabled_identifiers() {