@lix-js/sdk 0.6.0-preview.2 → 0.6.0-preview.3

package/dist-engine-src/src/sql2/directory_history_provider.rs

@@ -21,7 +21,6 @@ use futures_util::stream;
 use serde::Deserialize;
 use tokio::sync::Mutex;
 
-use crate::changelog::MaterializedCanonicalChange;
 use crate::commit_graph::CommitGraphReader;
 use crate::serialize_row_metadata;
 use crate::LixError;
@@ -32,17 +31,18 @@ use super::history_route::{
     HistoryColumnStyle, HistoryEntry, HistoryRoute, HistoryViewDescriptor, HISTORY_COL_CHANGE_ID,
     HISTORY_COL_COMMIT_CREATED_AT, HISTORY_COL_DEPTH, HISTORY_COL_ENTITY_ID, HISTORY_COL_FILE_ID,
     HISTORY_COL_METADATA, HISTORY_COL_OBSERVED_COMMIT_ID, HISTORY_COL_SCHEMA_KEY,
-    HISTORY_COL_SCHEMA_VERSION, HISTORY_COL_SNAPSHOT_CONTENT, HISTORY_COL_START_COMMIT_ID,
+    HISTORY_COL_SNAPSHOT_CONTENT, HISTORY_COL_START_COMMIT_ID,
 };
 use super::result_metadata::json_field;
-use super::SqlChangelogQuerySource;
+use super::SqlCommitStoreQuerySource;
+use crate::commit_store::MaterializedChange;
 
 const DIRECTORY_DESCRIPTOR_SCHEMA_KEY: &str = "lix_directory_descriptor";
 
 pub(crate) async fn register_lix_directory_history_provider(
     session: &datafusion::prelude::SessionContext,
     commit_graph: Box<dyn CommitGraphReader>,
-    query_source: SqlChangelogQuerySource,
+    query_source: SqlCommitStoreQuerySource,
 ) -> Result<(), LixError> {
     session
         .register_table(
@@ -59,7 +59,7 @@ pub(crate) async fn register_lix_directory_history_provider(
 struct LixDirectoryHistoryProvider {
     schema: SchemaRef,
     commit_graph: Arc<Mutex<Box<dyn CommitGraphReader>>>,
-    query_source: SqlChangelogQuerySource,
+    query_source: SqlCommitStoreQuerySource,
 }
 
 impl std::fmt::Debug for LixDirectoryHistoryProvider {
@@ -71,7 +71,7 @@ impl std::fmt::Debug for LixDirectoryHistoryProvider {
 impl LixDirectoryHistoryProvider {
     fn new(
         commit_graph: Arc<Mutex<Box<dyn CommitGraphReader>>>,
-        query_source: SqlChangelogQuerySource,
+        query_source: SqlCommitStoreQuerySource,
     ) -> Self {
         Self {
             schema: lix_directory_history_schema(),
@@ -130,7 +130,7 @@ impl TableProvider for LixDirectoryHistoryProvider {
 
 struct LixDirectoryHistoryScanExec {
     commit_graph: Arc<Mutex<Box<dyn CommitGraphReader>>>,
-    query_source: SqlChangelogQuerySource,
+    query_source: SqlCommitStoreQuerySource,
     schema: SchemaRef,
     route: HistoryRoute,
     limit: Option<usize>,
@@ -149,7 +149,7 @@ impl std::fmt::Debug for LixDirectoryHistoryScanExec {
 impl LixDirectoryHistoryScanExec {
     fn new(
         commit_graph: Arc<Mutex<Box<dyn CommitGraphReader>>>,
-        query_source: SqlChangelogQuerySource,
+        query_source: SqlCommitStoreQuerySource,
         schema: SchemaRef,
         route: HistoryRoute,
         limit: Option<usize>,
@@ -265,7 +265,7 @@ struct DirectoryHistoryOutputRow {
     parent_id: Option<String>,
     name: Option<String>,
     hidden: Option<bool>,
-    descriptor_change: MaterializedCanonicalChange,
+    descriptor_change: MaterializedChange,
     event: DirectoryHistoryEvent,
 }
 
@@ -274,7 +274,7 @@ struct DirectoryHistoryEvent {
     directory_id: String,
     start_commit_id: String,
     depth: u32,
-    change: MaterializedCanonicalChange,
+    change: MaterializedChange,
     observed_commit_id: String,
     commit_created_at: String,
 }
@@ -289,7 +289,7 @@ struct DirectoryDescriptorSnapshot {
 
 async fn load_directory_history_rows(
     commit_graph: Arc<Mutex<Box<dyn CommitGraphReader>>>,
-    query_source: SqlChangelogQuerySource,
+    query_source: SqlCommitStoreQuerySource,
     route: &HistoryRoute,
 ) -> Result<Vec<DirectoryHistoryOutputRow>, LixError> {
     let event_route = route.traversal_only();
@@ -356,9 +356,10 @@ async fn load_directory_history_rows(
         });
     }
     output.retain(|row| {
+        let entity_id = entity_id_json_array(&row.entity_id).ok();
         route.matches_surface_row(
             DIRECTORY_DESCRIPTOR_SCHEMA_KEY,
-            &row.entity_id,
+            entity_id.as_deref().unwrap_or(&row.entity_id),
             None,
             row.event.depth,
         )
@@ -388,7 +389,7 @@ fn parse_directory_history_records(
         .map(|entry| {
             let Some(snapshot_content) = entry.change.snapshot_content.as_deref() else {
                 return Ok(DirectoryHistoryRecord {
-                    id: entry.change.entity_id.as_string()?,
+                    id: entry.change.entity_id.as_single_string_owned()?,
                     parent_id: None,
                     name: None,
                     hidden: None,
@@ -528,15 +529,15 @@ fn directory_history_column_array(
         "hidden" => Arc::new(BooleanArray::from(
             rows.iter().map(|row| row.hidden).collect::<Vec<_>>(),
         )) as ArrayRef,
-        HISTORY_COL_ENTITY_ID => string_array(rows.iter().map(|row| Some(row.entity_id.as_str()))),
+        HISTORY_COL_ENTITY_ID => Arc::new(StringArray::from(
+            rows.iter()
+                .map(|row| entity_id_json_array(&row.entity_id).map(Some))
+                .collect::<std::result::Result<Vec<_>, _>>()?,
+        )) as ArrayRef,
         HISTORY_COL_SCHEMA_KEY => {
             string_array(rows.iter().map(|_| Some(DIRECTORY_DESCRIPTOR_SCHEMA_KEY)))
         }
         HISTORY_COL_FILE_ID => string_array(rows.iter().map(|_| None)),
-        HISTORY_COL_SCHEMA_VERSION => string_array(
-            rows.iter()
-                .map(|row| Some(row.descriptor_change.schema_version.as_str())),
-        ),
         HISTORY_COL_CHANGE_ID => {
             string_array(rows.iter().map(|row| Some(row.event.change.id.as_str())))
         }
@@ -589,11 +590,10 @@ fn lix_directory_history_schema() -> SchemaRef {
         Field::new("parent_id", DataType::Utf8, true),
         Field::new("name", DataType::Utf8, true),
         Field::new("hidden", DataType::Boolean, true),
-        Field::new(HISTORY_COL_ENTITY_ID, DataType::Utf8, false),
+        json_field(HISTORY_COL_ENTITY_ID, false),
         Field::new(HISTORY_COL_SCHEMA_KEY, DataType::Utf8, false),
         Field::new(HISTORY_COL_FILE_ID, DataType::Utf8, true),
         json_field(HISTORY_COL_SNAPSHOT_CONTENT, true),
-        Field::new(HISTORY_COL_SCHEMA_VERSION, DataType::Utf8, false),
         Field::new(HISTORY_COL_CHANGE_ID, DataType::Utf8, false),
         json_field(HISTORY_COL_METADATA, true),
         Field::new(HISTORY_COL_OBSERVED_COMMIT_ID, DataType::Utf8, false),
@@ -618,6 +618,14 @@ fn datafusion_error_to_lix_error(error: DataFusionError) -> LixError {
     super::error::datafusion_error_to_lix_error(error)
 }
 
+fn entity_id_json_array(entity_id: &str) -> Result<String, LixError> {
+    serde_json::to_string(&[entity_id]).map_err(|error| {
+        LixError::unknown(format!(
+            "failed to encode history entity id as JSON: {error}"
+        ))
+    })
+}
+
 fn lix_error_to_datafusion_error(error: LixError) -> DataFusionError {
     super::error::lix_error_to_datafusion_error(error)
 }