refactor and docs

marvin-j97 · Jan 14, 2024 · de83bdc · de83bdc
1 parent b866834
commit de83bdc
Show file tree

Hide file tree

Showing 12 changed files with 141 additions and 168 deletions.
diff --git a/app/src/App.tsx b/app/src/App.tsx
@@ -219,9 +219,9 @@ function App() {
     y: bytes,
   }));
 
-  const journalCount = () => (sysRows().find(x => x.row_key === "wal#len")?.columns.value[""] ?? []).map(({ timestamp, value: { Byte: y } }) => ({
+  const journalCount = () => (sysRows().find(x => x.row_key === "wal#len")?.columns.value[""] ?? []).map(({ timestamp, value: { F64, Byte } }) => ({
     x: new Date(timestamp / 1000 / 1000),
-    y,
+    y: Byte ?? F64, // NOTE: Byte has changed to F64
   }));
 
   const writeLatency = () => extractTimeseries(tableStatsMap(), "lat#write#batch");

diff --git a/server/src/api/delete_row.rs b/server/src/api/delete_row.rs
@@ -1,4 +1,5 @@
 use crate::app_state::AppState;
+use crate::data_point;
 use crate::error::CustomRouteResult;
 use crate::identifier::is_valid_table_identifier;
 use crate::response::build_response;
@@ -10,7 +11,7 @@ use actix_web::{
 };
 use serde::Deserialize;
 use serde_json::json;
-use smoltable::{CellValue, ColumnKey, ColumnWriteItem, RowWriteItem, TableWriter};
+use smoltable::TableWriter;
 
 #[derive(Debug, Deserialize)]
 pub struct Input {
@@ -65,22 +66,8 @@ pub async fn handler(
         TableWriter::write_batch(
             table.metrics.clone(),
             &[
-                RowWriteItem {
-                    row_key: "lat#del#row".to_string(),
-                    cells: vec![ColumnWriteItem {
-                        column_key: ColumnKey::try_from("value").expect("should be column key"),
-                        timestamp: None,
-                        value: CellValue::F64(micros_total as f64),
-                    }],
-                },
-                RowWriteItem {
-                    row_key: "lat#del#cell".to_string(),
-                    cells: vec![ColumnWriteItem {
-                        column_key: ColumnKey::try_from("value").expect("should be column key"),
-                        timestamp: None,
-                        value: CellValue::F64(micros_per_item as f64),
-                    }],
-                },
+                smoltable::row!("lat#del#row", vec![data_point!(micros_total as f64)]),
+                smoltable::row!("lat#del#cell", vec![data_point!(micros_per_item as f64)]),
             ],
         )
         .ok();

diff --git a/server/src/api/get_rows.rs b/server/src/api/get_rows.rs
@@ -1,4 +1,5 @@
 use crate::app_state::AppState;
+use crate::data_point;
 use crate::error::CustomRouteResult;
 use crate::identifier::is_valid_table_identifier;
 use crate::response::build_response;
@@ -10,7 +11,7 @@ use actix_web::{
 };
 use serde::{Deserialize, Serialize};
 use serde_json::json;
-use smoltable::{CellValue, ColumnKey, ColumnWriteItem, QueryRowInput, RowWriteItem, TableWriter};
+use smoltable::{QueryRowInput, TableWriter};
 
 #[derive(Debug, Deserialize, Serialize)]
 struct Input {
@@ -62,14 +63,10 @@ pub async fn handler(
 
         TableWriter::write_batch(
             table.metrics.clone(),
-            &[RowWriteItem {
-                row_key: "lat#read#row".to_string(),
-                cells: vec![ColumnWriteItem {
-                    column_key: ColumnKey::try_from("value").expect("should be column key"),
-                    timestamp: None,
-                    value: CellValue::F64(micros_per_row.unwrap_or_default() as f64),
-                }],
-            }],
+            &[smoltable::row!(
+                "lat#read#row",
+                vec![data_point!(micros_per_row.unwrap_or_default() as f64)]
+            )],
         )
         .ok();
 

diff --git a/server/src/api/prefix.rs b/server/src/api/prefix.rs
@@ -1,4 +1,5 @@
 use crate::app_state::AppState;
+use crate::data_point;
 use crate::error::CustomRouteResult;
 use crate::identifier::is_valid_table_identifier;
 use crate::response::build_response;
@@ -9,9 +10,7 @@ use actix_web::{
     HttpResponse,
 };
 use serde_json::json;
-use smoltable::{
-    CellValue, ColumnKey, ColumnWriteItem, QueryPrefixInput, RowWriteItem, TableWriter,
-};
+use smoltable::{QueryPrefixInput, TableWriter};
 
 #[post("/v1/table/{name}/prefix")]
 pub async fn handler(
@@ -58,14 +57,10 @@ pub async fn handler(
 
         TableWriter::write_batch(
             table.metrics.clone(),
-            &[RowWriteItem {
-                row_key: "lat#read#pfx".to_string(),
-                cells: vec![ColumnWriteItem {
-                    column_key: ColumnKey::try_from("value").expect("should be column key"),
-                    timestamp: None,
-                    value: CellValue::F64(micros_total as f64),
-                }],
-            }],
+            &[smoltable::row!(
+                "lat#read#pfx",
+                vec![data_point!(micros_total as f64)]
+            )],
         )
         .ok();
 

diff --git a/server/src/api/write.rs b/server/src/api/write.rs
@@ -1,5 +1,6 @@
 use super::bad_request;
 use crate::app_state::AppState;
+use crate::data_point;
 use crate::error::CustomRouteResult;
 use crate::identifier::is_valid_table_identifier;
 use crate::response::build_response;
@@ -11,7 +12,7 @@ use actix_web::{
 };
 use serde::Deserialize;
 use serde_json::json;
-use smoltable::{CellValue, ColumnKey, ColumnWriteItem, RowWriteItem, TableWriter};
+use smoltable::{RowWriteItem, TableWriter};
 use std::ops::Deref;
 
 #[derive(Debug, Deserialize)]
@@ -100,22 +101,8 @@ pub async fn handler(
         TableWriter::write_batch(
             table.metrics.clone(),
             &[
-                RowWriteItem {
-                    row_key: "lat#write#cell".to_string(),
-                    cells: vec![ColumnWriteItem {
-                        column_key: ColumnKey::try_from("value").expect("should be column key"),
-                        timestamp: None,
-                        value: CellValue::F64(micros_per_cell as f64),
-                    }],
-                },
-                RowWriteItem {
-                    row_key: "lat#write#batch".to_string(),
-                    cells: vec![ColumnWriteItem {
-                        column_key: ColumnKey::try_from("value").expect("should be column key"),
-                        timestamp: None,
-                        value: CellValue::F64(micros_total as f64),
-                    }],
-                },
+                smoltable::row!("lat#write#cell", vec![data_point!(micros_per_cell as f64)]),
+                smoltable::row!("lat#write#batch", vec![data_point!(micros_total as f64)]),
             ],
         )
         .ok();