get rid of methods on OxqlTable

david-crespo · david-crespo · commit 0e9ce3be2a43 · 2025-08-18T12:55:45.000-05:00
diff --git a/nexus/tests/integration_tests/metrics.rs b/nexus/tests/integration_tests/metrics.rs
@@ -277,10 +277,11 @@ async fn test_instance_watcher_metrics(
         use oxql_types::point::ValueArray;
         let uuid = FieldValue::Uuid(instance_id.into_untyped_uuid());
         let state = FieldValue::String(state.into());
-        let mut timeserieses = table.timeseries().filter(|ts| {
-            ts.fields.get(INSTANCE_ID_FIELD) == Some(&uuid)
-                && ts.fields.get(STATE_FIELD) == Some(&state)
-        });
+        let mut timeserieses =
+            table.timeseries.clone().into_iter().filter(|ts| {
+                ts.fields.get(INSTANCE_ID_FIELD) == Some(&uuid)
+                    && ts.fields.get(STATE_FIELD) == Some(&state)
+            });
         let timeseries = timeserieses.next().ok_or_else(|| {
             MetricsNotYet::new(format!(
                 "missing timeseries for instance {instance_id}, state {state}\n\
@@ -325,7 +326,7 @@ async fn test_instance_watcher_metrics(
         .system_timeseries_query_until(OXQL_QUERY, |metrics| {
             let checks = metrics
                 .iter()
-                .find(|t| t.name() == "virtual_machine:check")
+                .find(|t| t.name == "virtual_machine:check")
                 .ok_or_else(|| {
                     MetricsNotYet::new("missing virtual_machine:check")
                 })?;
@@ -348,7 +349,7 @@ async fn test_instance_watcher_metrics(
         .system_timeseries_query_until(OXQL_QUERY, |metrics| {
             let checks = metrics
                 .iter()
-                .find(|t| t.name() == "virtual_machine:check")
+                .find(|t| t.name == "virtual_machine:check")
                 .expect("missing virtual_machine:check");
             let ts1 =
                 dbg!(count_state(&checks, instance1_uuid, STATE_STARTING)?);
@@ -371,7 +372,7 @@ async fn test_instance_watcher_metrics(
         .system_timeseries_query_until(OXQL_QUERY, |metrics| {
             let checks = metrics
                 .iter()
-                .find(|t| t.name() == "virtual_machine:check")
+                .find(|t| t.name == "virtual_machine:check")
                 .expect("missing virtual_machine:check");
             let ts1_starting =
                 dbg!(count_state(&checks, instance1_uuid, STATE_STARTING)?);
@@ -402,7 +403,7 @@ async fn test_instance_watcher_metrics(
         .system_timeseries_query_until(OXQL_QUERY, |metrics| {
             let checks = metrics
                 .iter()
-                .find(|t| t.name() == "virtual_machine:check")
+                .find(|t| t.name == "virtual_machine:check")
                 .expect("missing virtual_machine:check");
 
             let ts1_starting =
@@ -437,7 +438,7 @@ async fn test_instance_watcher_metrics(
         .system_timeseries_query_until(OXQL_QUERY, |metrics| {
             let checks = metrics
                 .iter()
-                .find(|t| t.name() == "virtual_machine:check")
+                .find(|t| t.name == "virtual_machine:check")
                 .expect("missing virtual_machine:check");
             let ts1_starting =
                 dbg!(count_state(&checks, instance1_uuid, STATE_STARTING)?);
@@ -497,7 +498,7 @@ async fn test_project_timeseries_query(
                 return Err(MetricsNotYet::new("waiting for table creation"));
             }
             assert_eq!(result.len(), 1);
-            if result[0].timeseries().len() == 0 {
+            if result[0].timeseries.is_empty() {
                 return Err(MetricsNotYet::new(
                     "waiting for timeseries population",
                 ));
@@ -511,23 +512,23 @@ async fn test_project_timeseries_query(
         .project_timeseries_query(&p1.identity.id.to_string(), q1)
         .await;
     assert_eq!(result.len(), 1);
-    assert!(result[0].timeseries().len() > 0);
+    assert!(!result[0].timeseries.is_empty());
 
     let result = metrics_querier.project_timeseries_query("project2", q1).await;
     assert_eq!(result.len(), 1);
-    assert!(result[0].timeseries().len() > 0);
+    assert!(!result[0].timeseries.is_empty());
 
     // with project specified
     let q2 = &format!("{} | filter project_id == \"{}\"", q1, p1.identity.id);
 
     let result = metrics_querier.project_timeseries_query("project1", q2).await;
     assert_eq!(result.len(), 1);
     // we get 2 timeseries because there are two instances
-    assert!(result[0].timeseries().len() == 2);
+    assert!(result[0].timeseries.len() == 2);
 
     let result = metrics_querier.project_timeseries_query("project2", q2).await;
     assert_eq!(result.len(), 1);
-    assert_eq!(result[0].timeseries().len(), 0);
+    assert_eq!(result[0].timeseries.len(), 0);
 
     // with instance specified
     let q3 =
@@ -536,12 +537,12 @@ async fn test_project_timeseries_query(
     // project containing instance gives me something
     let result = metrics_querier.project_timeseries_query("project1", q3).await;
     assert_eq!(result.len(), 1);
-    assert_eq!(result[0].timeseries().len(), 1);
+    assert_eq!(result[0].timeseries.len(), 1);
 
     // should be empty or error
     let result = metrics_querier.project_timeseries_query("project2", q3).await;
     assert_eq!(result.len(), 1);
-    assert_eq!(result[0].timeseries().len(), 0);
+    assert_eq!(result[0].timeseries.len(), 0);
 
     // now let's test it with group_by
     let q4 = &format!(
@@ -550,7 +551,7 @@ async fn test_project_timeseries_query(
     );
     let result = metrics_querier.project_timeseries_query("project1", q4).await;
     assert_eq!(result.len(), 1);
-    assert_eq!(result[0].timeseries().len(), 2);
+    assert_eq!(result[0].timeseries.len(), 2);
 
     // test with a nested query
     let q5 = &format!(
@@ -565,13 +566,13 @@ async fn test_project_timeseries_query(
     // we get two results, each contains one timeseries, and the instance ID
     // on each corresponds to the one we requested
     assert_eq!(result.len(), 2);
-    assert_eq!(result[0].timeseries().len(), 1);
-    let timeseries = result[0].timeseries().next().unwrap();
+    assert_eq!(result[0].timeseries.len(), 1);
+    let timeseries = result[0].timeseries[0].clone();
     let instance_id = timeseries.fields.get("instance_id").unwrap().to_string();
     assert_eq!(instance_id, i1p1.identity.id.to_string());
 
-    assert_eq!(result[1].timeseries().len(), 1);
-    let timeseries = result[1].timeseries().next().unwrap();
+    assert_eq!(result[1].timeseries.len(), 1);
+    let timeseries = &result[1].timeseries[0];
     let instance_id = timeseries.fields.get("instance_id").unwrap().to_string();
     assert_eq!(instance_id, i2p1.identity.id.to_string());
 
@@ -642,7 +643,7 @@ async fn test_project_timeseries_query(
         .execute_and_parse_unwrap::<views::OxqlQueryResult>()
         .await;
     assert_eq!(result.tables.len(), 1);
-    assert_eq!(result.tables[0].timeseries().len(), 2); // two instances
+    assert_eq!(result.tables[0].timeseries.len(), 2); // two instances
 }
 
 #[nexus_test]
@@ -780,7 +781,7 @@ async fn test_mgs_metrics(
         querier.system_timeseries_query_until(&query, |tables| {
             let table = tables
                 .into_iter()
-                .find(|t| t.name() == name)
+                .find(|t| t.name == *name)
                 .ok_or_else(|| {
                     MetricsNotYet::new(format!(
                         "failed to find table for {query}",
@@ -791,7 +792,7 @@ async fn test_mgs_metrics(
                 .keys()
                 .map(|serial| (serial.clone(), 0))
                 .collect::<HashMap<_, usize>>();
-            for timeseries in table.timeseries() {
+            for timeseries in &table.timeseries {
                 let fields = &timeseries.fields;
                 if timeseries.points.is_empty() {
                     return Err(MetricsNotYet::new(format!(
diff --git a/nexus/types/src/external_api/views.rs b/nexus/types/src/external_api/views.rs
@@ -1161,21 +1161,6 @@ impl From<oxql_types::Table> for OxqlTable {
     }
 }
 
-// these methods are only used in tests
-impl OxqlTable {
-    /// Return the name of the table.
-    pub fn name(&self) -> &str {
-        self.name.as_str()
-    }
-
-    /// Return the list of timeseries in this table, ordered by key.
-    pub fn timeseries(
-        &self,
-    ) -> impl ExactSizeIterator<Item = &oxql_types::Timeseries> {
-        self.timeseries.iter()
-    }
-}
-
 /// The result of a successful OxQL query.
 #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
 pub struct OxqlQueryResult {
