Revert "Fix DataFusion object store registration"

This reverts commit 79a2d0c.

Author: cjdsellers

RELEASES.md

@@ -30,8 +30,7 @@ TBD
 
 ### Fixes
 - Fixed spawned order client_id caching in `ExecAlgorithm`, thanks for reporting @kirill-gr1
-- Fixed DataFusion object store registration for custom S3 endpoints (#3120), thanks for reporting @rgauny
-- Fixed Binance instrument info dict JSON serialization (#3128), thanks for reporting @woung717
+- Fixed Binance instrument info dict JSON serialization, thanks for reporting @woung717
 - Fixed Polymarket maker fill order side inversion (#3126), thanks for reporting @santivazq
 
 ### Internal Improvements

crates/persistence/src/backend/catalog.rs

@@ -940,10 +940,10 @@ impl ParquetDataCatalog {
         // Register the object store with the session for remote URIs
         if self.is_remote_uri() {
             let url = url::Url::parse(&self.original_uri)?;
-
-            // DataFusion requires registration with protocol-level URLs (e.g., "s3://")
-            // rather than bucket-specific URLs (e.g., "s3://bucket-name")
-            let base_url = url::Url::parse(&format!("{}://", url.scheme()))?;
+            let host = url
+                .host_str()
+                .ok_or_else(|| anyhow::anyhow!("Remote URI missing host/bucket name"))?;
+            let base_url = url::Url::parse(&format!("{}://{}", url.scheme(), host))?;
             self.session
                 .register_object_store(&base_url, self.object_store.clone());
         }

crates/persistence/src/backend/session.rs

@@ -110,8 +110,12 @@ impl DataBackendSession {
             parsed_uri.scheme(),
             "s3" | "gs" | "gcs" | "az" | "abfs" | "http" | "https"
         ) {
-            // For cloud storage, register with the generic protocol URL
-            let base_url = format!("{}://", parsed_uri.scheme());
+            // For cloud storage, register with the base URL (scheme + netloc)
+            let base_url = format!(
+                "{}://{}",
+                parsed_uri.scheme(),
+                parsed_uri.host_str().unwrap_or("")
+            );
             let base_parsed_url = Url::parse(&base_url)?;
             self.register_object_store(&base_parsed_url, object_store);
         }

crates/persistence/tests/test_catalog.rs

@@ -13,7 +13,7 @@
 //  limitations under the License.
 // -------------------------------------------------------------------------------------------------
 
-use std::{collections::HashMap, str::FromStr};
+use std::str::FromStr;
 
 use nautilus_core::UnixNanos;
 use nautilus_model::{
@@ -498,26 +498,6 @@ fn test_register_object_store_from_uri_nonexistent_path() {
     assert!(result.is_err());
 }
 
-#[rstest]
-fn test_register_object_store_from_uri_s3() {
-    // Test registering remote object store ensures scheme + host base URL parsing succeeds
-    let mut storage_options = HashMap::new();
-    storage_options.insert(
-        "endpoint_url".to_string(),
-        "https://test.endpoint.com".to_string(),
-    );
-    storage_options.insert("region".to_string(), "us-west-2".to_string());
-    storage_options.insert("access_key_id".to_string(), "test_key".to_string());
-    storage_options.insert("secret_access_key".to_string(), "test_secret".to_string());
-
-    let mut session = DataBackendSession::new(1000);
-
-    let result = session
-        .register_object_store_from_uri("s3://test-bucket/path/to/data", Some(storage_options));
-
-    assert!(result.is_ok());
-}
-
 #[rstest]
 fn test_rust_get_missing_intervals() {
     // Arrange