Remove analytics from the public API

Author: chvck

sdk/couchbase/src/clients/analytics_client.rs

@@ -1,7 +1,4 @@
 use crate::clients::agent_provider::CouchbaseAgentProvider;
-use crate::clients::analytics_client::{
-    AnalyticsClient, AnalyticsClientBackend, CouchbaseAnalyticsClient,
-};
 use crate::clients::bucket_client::{
     BucketClient, BucketClientBackend, Couchbase2BucketClient, CouchbaseBucketClient,
 };
@@ -118,21 +115,6 @@ impl ClusterClient {
             }
         }
     }
-
-    pub fn analytics_client(&self) -> AnalyticsClient {
-        match &self.backend {
-            ClusterClientBackend::CouchbaseClusterBackend(backend) => {
-                let analytics_client = backend.analytics_client();
-
-                AnalyticsClient::new(AnalyticsClientBackend::CouchbaseAnalyticsClientBackend(
-                    analytics_client,
-                ))
-            }
-            ClusterClientBackend::Couchbase2ClusterBackend(_) => {
-                unimplemented!()
-            }
-        }
-    }
 }
 
 struct CouchbaseClusterBackend {
@@ -227,12 +209,6 @@ impl CouchbaseClusterBackend {
         CouchbaseSearchClient::new(CouchbaseAgentProvider::with_agent(agent.clone()))
     }
 
-    fn analytics_client(&self) -> CouchbaseAnalyticsClient {
-        let agent = self.agent_manager.get_cluster_agent();
-
-        CouchbaseAnalyticsClient::new(CouchbaseAgentProvider::with_agent(agent.clone()))
-    }
-
     fn merge_options(
         opts: &mut OnDemandAgentManagerOptions,
         extra_opts: HashMap<String, Vec<String>>,

sdk/couchbase/src/clients/cluster_client.rs

@@ -1,5 +1,4 @@
 pub mod agent_provider;
-pub mod analytics_client;
 pub mod bucket_client;
 pub mod bucket_mgmt_client;
 pub mod cluster_client;

sdk/couchbase/src/clients/mod.rs

@@ -1,7 +1,4 @@
 use crate::clients::agent_provider::CouchbaseAgentProvider;
-use crate::clients::analytics_client::{
-    AnalyticsClient, AnalyticsClientBackend, AnalyticsKeyspace, CouchbaseAnalyticsClient,
-};
 use crate::clients::collection_client::{
     CollectionClient, CollectionClientBackend, Couchbase2CollectionClient,
     CouchbaseCollectionClient,
@@ -64,21 +61,6 @@ impl ScopeClient {
         }
     }
 
-    pub fn analytics_client(&self) -> AnalyticsClient {
-        match &self.backend {
-            ScopeClientBackend::CouchbaseScopeBackend(backend) => {
-                let analytics_client = backend.analytics_client();
-
-                AnalyticsClient::new(AnalyticsClientBackend::CouchbaseAnalyticsClientBackend(
-                    analytics_client,
-                ))
-            }
-            ScopeClientBackend::Couchbase2ScopeBackend(_) => {
-                unimplemented!()
-            }
-        }
-    }
-
     pub fn collection_client(&self, name: String) -> CollectionClient {
         match &self.backend {
             ScopeClientBackend::CouchbaseScopeBackend(client) => client.collection(name),
@@ -155,16 +137,6 @@ impl CouchbaseScopeClient {
             },
         )
     }
-
-    pub fn analytics_client(&self) -> CouchbaseAnalyticsClient {
-        CouchbaseAnalyticsClient::with_keyspace(
-            self.agent_provider.clone(),
-            AnalyticsKeyspace {
-                bucket_name: self.bucket_name().to_string(),
-                scope_name: self.name().to_string(),
-            },
-        )
-    }
 }
 
 #[derive(Clone)]

sdk/couchbase/src/clients/scope_client.rs

@@ -1,16 +1,13 @@
 use crate::bucket::Bucket;
-use crate::clients::analytics_client::AnalyticsClient;
 use crate::clients::bucket_mgmt_client::BucketMgmtClient;
 use crate::clients::cluster_client::ClusterClient;
 use crate::clients::query_client::QueryClient;
 use crate::clients::search_client::SearchClient;
 use crate::error;
 use crate::management::buckets::bucket_manager::BucketManager;
-use crate::options::analytics_options::AnalyticsOptions;
 use crate::options::cluster_options::ClusterOptions;
 use crate::options::query_options::QueryOptions;
 use crate::options::search_options::SearchOptions;
-use crate::results::analytics_results::AnalyticsResult;
 use crate::results::query_results::QueryResult;
 use crate::results::search_results::SearchResult;
 use crate::search::request::SearchRequest;
@@ -22,7 +19,6 @@ pub struct Cluster {
     bucket_mgmt_client: Arc<BucketMgmtClient>,
     query_client: Arc<QueryClient>,
     search_client: Arc<SearchClient>,
-    analytics_client: Arc<AnalyticsClient>,
 }
 
 impl Cluster {
@@ -35,14 +31,12 @@ impl Cluster {
         let bucket_mgmt_client = Arc::new(client.buckets_client());
         let query_client = Arc::new(client.query_client());
         let search_client = Arc::new(client.search_client());
-        let analytics_client = Arc::new(client.analytics_client());
 
         Ok(Cluster {
             client,
             bucket_mgmt_client,
             query_client,
             search_client,
-            analytics_client,
         })
     }
 
@@ -74,14 +68,4 @@ impl Cluster {
             .search(index_name.into(), request, opts.into())
             .await
     }
-
-    pub async fn analytics_query(
-        &self,
-        statement: impl AsRef<str>,
-        opts: impl Into<Option<AnalyticsOptions>>,
-    ) -> error::Result<AnalyticsResult> {
-        self.analytics_client
-            .query(statement.as_ref(), opts.into())
-            .await
-    }
 }