H-3538: Move DataTypeStore into store (hashintel#5525)

JesusFileto · Nov 5, 2024 · bb8728d · bb8728d
1 parent bb33fc3
commit bb8728d
Show file tree

Hide file tree

Showing 59 changed files with 590 additions and 490 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/apps/hash-graph/bins/cli/Cargo.toml b/apps/hash-graph/bins/cli/Cargo.toml
@@ -20,6 +20,7 @@ error-stack = { workspace = true }
 graph = { workspace = true, features = ["clap"] }
 graph-api = { workspace = true }
 graph-types = { workspace = true }
+hash-graph-store = { workspace = true }
 hash-tracing = { workspace = true, features = ["clap"] }
 temporal-client = { workspace = true }
 test-server = { workspace = true, optional = true }

diff --git a/apps/hash-graph/bins/cli/package.json b/apps/hash-graph/bins/cli/package.json
@@ -22,6 +22,7 @@
     "@rust/graph": "0.0.0-private",
     "@rust/graph-api": "0.0.0-private",
     "@rust/graph-types": "0.0.0-private",
+    "@rust/hash-graph-store": "0.0.0-private",
     "@rust/hash-tracing": "0.0.0-private",
     "@rust/temporal-client": "0.0.0-private",
     "@rust/test-server": "0.0.0-private",

diff --git a/apps/hash-graph/bins/cli/src/subcommand/reindex_cache.rs b/apps/hash-graph/bins/cli/src/subcommand/reindex_cache.rs
@@ -2,9 +2,10 @@ use authorization::NoAuthorization;
 use clap::Parser;
 use error_stack::{Report, Result, ResultExt, ensure};
 use graph::store::{
-    DataTypeStore, DatabaseConnectionInfo, DatabasePoolConfig, EntityStore, EntityTypeStore,
-    PostgresStorePool, StorePool,
+    DatabaseConnectionInfo, DatabasePoolConfig, PostgresStorePool, StorePool as _,
+    knowledge::EntityStore as _, ontology::EntityTypeStore as _,
 };
+use hash_graph_store::data_type::DataTypeStore as _;
 use tokio_postgres::NoTls;
 
 use crate::error::GraphError;
@@ -58,7 +59,8 @@ pub async fn reindex_cache(args: ReindexCacheArgs) -> Result<(), GraphError> {
 
     if args.operations.data_types {
         did_something = true;
-        DataTypeStore::reindex_data_type_cache(&mut store)
+        store
+            .reindex_data_type_cache()
             .await
             .change_context(GraphError)
             .map_err(|report| {
@@ -69,7 +71,8 @@ pub async fn reindex_cache(args: ReindexCacheArgs) -> Result<(), GraphError> {
 
     if args.operations.entity_types {
         did_something = true;
-        EntityTypeStore::reindex_entity_type_cache(&mut store)
+        store
+            .reindex_entity_type_cache()
             .await
             .change_context(GraphError)
             .map_err(|report| {
@@ -80,7 +83,8 @@ pub async fn reindex_cache(args: ReindexCacheArgs) -> Result<(), GraphError> {
 
     if args.operations.entities {
         did_something = true;
-        EntityStore::reindex_entity_cache(&mut store)
+        store
+            .reindex_entity_cache()
             .await
             .change_context(GraphError)
             .map_err(|report| {
@@ -89,6 +93,8 @@ pub async fn reindex_cache(args: ReindexCacheArgs) -> Result<(), GraphError> {
             })?;
     }
 
+    drop(store);
+
     ensure!(
         did_something,
         Report::new(GraphError).attach_printable(

diff --git a/apps/hash-graph/libs/api/src/rest/data_type.rs b/apps/hash-graph/libs/api/src/rest/data_type.rs
@@ -25,13 +25,8 @@ use graph::{
         patch_id_and_parse,
     },
     store::{
-        DataTypeStore, OntologyVersionDoesNotExist, StorePool,
-        error::VersionedUrlAlreadyExists,
-        ontology::{
-            ArchiveDataTypeParams, CreateDataTypeParams, GetDataTypeSubgraphParams,
-            GetDataTypesParams, GetDataTypesResponse, UnarchiveDataTypeParams,
-            UpdateDataTypeEmbeddingParams, UpdateDataTypesParams,
-        },
+        StorePool,
+        error::{OntologyVersionDoesNotExist, VersionedUrlAlreadyExists},
     },
 };
 use graph_types::{
@@ -42,7 +37,14 @@ use graph_types::{
     },
     owned_by_id::OwnedById,
 };
-use hash_graph_store::{ConflictBehavior, data_type::DataTypeQueryToken};
+use hash_graph_store::{
+    ConflictBehavior,
+    data_type::{
+        ArchiveDataTypeParams, CreateDataTypeParams, DataTypeQueryToken, DataTypeStore as _,
+        GetDataTypeSubgraphParams, GetDataTypesParams, GetDataTypesResponse,
+        UnarchiveDataTypeParams, UpdateDataTypeEmbeddingParams, UpdateDataTypesParams,
+    },
+};
 use hash_status::Status;
 use serde::{Deserialize, Serialize};
 use temporal_client::TemporalClient;

diff --git a/apps/hash-graph/libs/api/src/rest/entity.rs b/apps/hash-graph/libs/api/src/rest/entity.rs
@@ -22,13 +22,13 @@ use axum::{
 };
 use error_stack::{Report, ResultExt};
 use graph::store::{
-    EntityQueryCursor, EntityQuerySorting, EntityQuerySortingRecord, EntityStore,
-    EntityValidationType, NullOrdering, Ordering, StorePool,
+    NullOrdering, Ordering, StorePool,
     error::{EntityDoesNotExist, RaceConditionOnUpdate},
     knowledge::{
         CountEntitiesParams, CreateEntityRequest, DiffEntityParams, DiffEntityResult,
-        GetEntitiesParams, GetEntitiesResponse, GetEntitySubgraphParams, PatchEntityParams,
-        QueryConversion, UpdateEntityEmbeddingsParams, ValidateEntityParams,
+        EntityQueryCursor, EntityQuerySorting, EntityQuerySortingRecord, EntityStore as _,
+        EntityValidationType, GetEntitiesParams, GetEntitiesResponse, GetEntitySubgraphParams,
+        PatchEntityParams, QueryConversion, UpdateEntityEmbeddingsParams, ValidateEntityParams,
     },
 };
 use graph_types::{

diff --git a/apps/hash-graph/libs/api/src/rest/entity_type.rs b/apps/hash-graph/libs/api/src/rest/entity_type.rs
@@ -27,13 +27,13 @@ use graph::{
         patch_id_and_parse,
     },
     store::{
-        EntityTypeStore, StorePool,
+        StorePool,
         error::{BaseUrlAlreadyExists, OntologyVersionDoesNotExist, VersionedUrlAlreadyExists},
         ontology::{
-            ArchiveEntityTypeParams, CreateEntityTypeParams, GetClosedMultiEntityTypeParams,
-            GetClosedMultiEntityTypeResponse, GetEntityTypeSubgraphParams, GetEntityTypesParams,
-            GetEntityTypesResponse, UnarchiveEntityTypeParams, UpdateEntityTypeEmbeddingParams,
-            UpdateEntityTypesParams,
+            ArchiveEntityTypeParams, CreateEntityTypeParams, EntityTypeStore as _,
+            GetClosedMultiEntityTypeParams, GetClosedMultiEntityTypeResponse,
+            GetEntityTypeSubgraphParams, GetEntityTypesParams, GetEntityTypesResponse,
+            UnarchiveEntityTypeParams, UpdateEntityTypeEmbeddingParams, UpdateEntityTypesParams,
         },
     },
 };

diff --git a/apps/hash-graph/libs/api/src/rest/property_type.rs b/apps/hash-graph/libs/api/src/rest/property_type.rs
@@ -26,12 +26,13 @@ use graph::{
         patch_id_and_parse,
     },
     store::{
-        OntologyVersionDoesNotExist, PropertyTypeStore, StorePool,
-        error::VersionedUrlAlreadyExists,
+        StorePool,
+        error::{OntologyVersionDoesNotExist, VersionedUrlAlreadyExists},
         ontology::{
             ArchivePropertyTypeParams, CreatePropertyTypeParams, GetPropertyTypeSubgraphParams,
-            GetPropertyTypesParams, GetPropertyTypesResponse, UnarchivePropertyTypeParams,
-            UpdatePropertyTypeEmbeddingParams, UpdatePropertyTypesParams,
+            GetPropertyTypesParams, GetPropertyTypesResponse, PropertyTypeStore as _,
+            UnarchivePropertyTypeParams, UpdatePropertyTypeEmbeddingParams,
+            UpdatePropertyTypesParams,
         },
     },
 };

diff --git a/apps/hash-graph/libs/api/src/rest/status.rs b/apps/hash-graph/libs/api/src/rest/status.rs
@@ -6,7 +6,7 @@ use axum::{
     response::{IntoResponse, Response},
 };
 use error_stack::{Context, Report};
-use graph::store::BaseUrlAlreadyExists;
+use graph::store::error::BaseUrlAlreadyExists;
 use hash_status::{Status, StatusCode};
 use serde::Serialize;
 

diff --git a/apps/hash-graph/libs/graph/src/snapshot/entity/batch.rs b/apps/hash-graph/libs/graph/src/snapshot/entity/batch.rs
@@ -8,19 +8,23 @@ use graph_types::{
     },
     ontology::OntologyTypeProvider,
 };
-use hash_graph_store::filter::Filter;
+use hash_graph_store::{error::InsertionError, filter::Filter};
 use tokio_postgres::GenericClient;
 use type_system::schema::{ClosedEntityType, ClosedMultiEntityType};
 use validation::{EntityPreprocessor, Validate, ValidateEntityComponents};
 
 use crate::{
     snapshot::WriteBatch,
     store::{
-        AsClient, EntityStore, InsertionError, PostgresStore, StoreCache, StoreProvider,
+        StoreCache, StoreProvider,
         crud::Read,
-        postgres::query::rows::{
-            EntityDraftRow, EntityEditionRow, EntityEmbeddingRow, EntityHasLeftEntityRow,
-            EntityHasRightEntityRow, EntityIdRow, EntityIsOfTypeRow, EntityTemporalMetadataRow,
+        knowledge::EntityStore as _,
+        postgres::{
+            AsClient, PostgresStore,
+            query::rows::{
+                EntityDraftRow, EntityEditionRow, EntityEmbeddingRow, EntityHasLeftEntityRow,
+                EntityHasRightEntityRow, EntityIdRow, EntityIsOfTypeRow, EntityTemporalMetadataRow,
+            },
         },
     },
 };

diff --git a/apps/hash-graph/libs/graph/src/snapshot/mod.rs b/apps/hash-graph/libs/graph/src/snapshot/mod.rs
@@ -43,7 +43,10 @@ use graph_types::{
     ontology::{DataTypeWithMetadata, EntityTypeWithMetadata, PropertyTypeWithMetadata},
     owned_by_id::OwnedById,
 };
-use hash_graph_store::filter::{Filter, QueryRecord};
+use hash_graph_store::{
+    error::InsertionError,
+    filter::{Filter, QueryRecord},
+};
 use hash_status::StatusCode;
 use postgres_types::ToSql;
 use serde::{Deserialize, Serialize};
@@ -61,7 +64,11 @@ use crate::{
         },
         restore::SnapshotRecordBatch,
     },
-    store::{AsClient, InsertionError, PostgresStore, PostgresStorePool, StorePool, crud::Read},
+    store::{
+        StorePool,
+        crud::Read,
+        postgres::{AsClient, PostgresStore, PostgresStorePool},
+    },
 };
 
 #[derive(Debug, Serialize, Deserialize)]

diff --git a/apps/hash-graph/libs/graph/src/snapshot/ontology/data_type/batch.rs b/apps/hash-graph/libs/graph/src/snapshot/ontology/data_type/batch.rs
@@ -4,13 +4,14 @@ use authorization::{
     AuthorizationApi, backend::ZanzibarBackend, schema::DataTypeRelationAndSubject,
 };
 use error_stack::{Result, ResultExt};
+use hash_graph_store::{data_type::DataTypeStore, error::InsertionError};
 use tokio_postgres::GenericClient;
 use type_system::schema::DataTypeUuid;
 
 use crate::{
     snapshot::WriteBatch,
     store::{
-        AsClient, DataTypeStore, InsertionError, PostgresStore,
+        AsClient, PostgresStore,
         postgres::query::rows::{DataTypeConversionsRow, DataTypeEmbeddingRow, DataTypeRow},
     },
 };

diff --git a/apps/hash-graph/libs/graph/src/snapshot/ontology/entity_type/batch.rs b/apps/hash-graph/libs/graph/src/snapshot/ontology/entity_type/batch.rs
@@ -4,13 +4,15 @@ use authorization::{
     AuthorizationApi, backend::ZanzibarBackend, schema::EntityTypeRelationAndSubject,
 };
 use error_stack::{Result, ResultExt};
+use hash_graph_store::error::InsertionError;
 use tokio_postgres::GenericClient;
 use type_system::schema::EntityTypeUuid;
 
 use crate::{
     snapshot::WriteBatch,
     store::{
-        AsClient, EntityTypeStore as _, InsertionError, PostgresStore,
+        AsClient, PostgresStore,
+        ontology::EntityTypeStore as _,
         postgres::query::rows::{EntityTypeEmbeddingRow, EntityTypeRow},
     },
 };

diff --git a/apps/hash-graph/libs/graph/src/snapshot/ontology/metadata/batch.rs b/apps/hash-graph/libs/graph/src/snapshot/ontology/metadata/batch.rs
@@ -1,10 +1,11 @@
 use error_stack::{Result, ResultExt};
+use hash_graph_store::error::InsertionError;
 use tokio_postgres::GenericClient;
 
 use crate::{
     snapshot::WriteBatch,
     store::{
-        AsClient, InsertionError, PostgresStore,
+        AsClient, PostgresStore,
         postgres::query::rows::{
             OntologyExternalMetadataRow, OntologyIdRow, OntologyOwnedMetadataRow,
             OntologyTemporalMetadataRow,

diff --git a/apps/hash-graph/libs/graph/src/snapshot/ontology/property_type/batch.rs b/apps/hash-graph/libs/graph/src/snapshot/ontology/property_type/batch.rs
@@ -2,13 +2,14 @@ use std::collections::HashMap;
 
 use authorization::{backend::ZanzibarBackend, schema::PropertyTypeRelationAndSubject};
 use error_stack::{Result, ResultExt};
+use hash_graph_store::error::InsertionError;
 use tokio_postgres::GenericClient;
 use type_system::schema::PropertyTypeUuid;
 
 use crate::{
     snapshot::WriteBatch,
     store::{
-        AsClient, InsertionError, PostgresStore,
+        AsClient, PostgresStore,
         postgres::query::rows::{
             PropertyTypeConstrainsPropertiesOnRow, PropertyTypeConstrainsValuesOnRow,
             PropertyTypeEmbeddingRow, PropertyTypeRow,

diff --git a/apps/hash-graph/libs/graph/src/snapshot/owner/batch.rs b/apps/hash-graph/libs/graph/src/snapshot/owner/batch.rs
@@ -1,14 +1,15 @@
 use authorization::{backend::ZanzibarBackend, schema::AccountGroupRelationAndSubject};
 use error_stack::{Result, ResultExt};
 use graph_types::account::AccountGroupId;
+use hash_graph_store::error::InsertionError;
 use tokio_postgres::GenericClient;
 
 use crate::{
     snapshot::{
         WriteBatch,
         owner::{AccountGroupRow, AccountRow},
     },
-    store::{AsClient, InsertionError, PostgresStore},
+    store::{AsClient, PostgresStore},
 };
 
 pub enum AccountRowBatch {

diff --git a/apps/hash-graph/libs/graph/src/snapshot/restore/batch.rs b/apps/hash-graph/libs/graph/src/snapshot/restore/batch.rs
@@ -1,5 +1,6 @@
 use authorization::{AuthorizationApi, backend::ZanzibarBackend};
 use error_stack::Result;
+use hash_graph_store::error::InsertionError;
 
 use crate::{
     snapshot::{
@@ -12,7 +13,7 @@ use crate::{
         owner::AccountRowBatch,
         web::WebBatch,
     },
-    store::{AsClient, InsertionError, PostgresStore},
+    store::{AsClient, PostgresStore},
 };
 
 pub enum SnapshotRecordBatch {

diff --git a/apps/hash-graph/libs/graph/src/snapshot/web/batch.rs b/apps/hash-graph/libs/graph/src/snapshot/web/batch.rs
@@ -1,11 +1,12 @@
 use authorization::{backend::ZanzibarBackend, schema::WebRelationAndSubject};
 use error_stack::{Result, ResultExt};
 use graph_types::owned_by_id::OwnedById;
+use hash_graph_store::error::InsertionError;
 use tokio_postgres::GenericClient;
 
 use crate::{
     snapshot::WriteBatch,
-    store::{AsClient, InsertionError, PostgresStore, postgres::query::rows::WebRow},
+    store::{AsClient, PostgresStore, postgres::query::rows::WebRow},
 };
 
 pub enum WebBatch {

diff --git a/apps/hash-graph/libs/graph/src/store/crud.rs b/apps/hash-graph/libs/graph/src/store/crud.rs
@@ -9,14 +9,13 @@
 use error_stack::Result;
 use futures::{Stream, TryFutureExt, TryStreamExt};
 use hash_graph_store::{
+    error::QueryError,
     filter::{Filter, QueryRecord},
     subgraph::{SubgraphRecord, temporal_axes::QueryTemporalAxes},
 };
 use tracing::instrument;
 use type_system::url::VersionedUrl;
 
-use crate::store::QueryError;
-
 pub trait QueryResult<R, S: Sorting> {
     type Indices: Send;
 

diff --git a/apps/hash-graph/libs/graph/src/store/error.rs b/apps/hash-graph/libs/graph/src/store/error.rs
@@ -13,42 +13,6 @@ impl fmt::Display for StoreError {
     }
 }
 
-#[derive(Debug)]
-#[must_use]
-pub struct InsertionError;
-
-impl fmt::Display for InsertionError {
-    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
-        fmt.write_str("Could not insert into store")
-    }
-}
-
-impl Context for InsertionError {}
-
-#[derive(Debug, Clone)]
-#[must_use]
-pub struct QueryError;
-
-impl fmt::Display for QueryError {
-    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
-        fmt.write_str("Could not query from store")
-    }
-}
-
-impl Context for QueryError {}
-
-#[derive(Debug)]
-#[must_use]
-pub struct UpdateError;
-
-impl fmt::Display for UpdateError {
-    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
-        fmt.write_str("Could not update store")
-    }
-}
-
-impl Context for UpdateError {}
-
 #[derive(Debug)]
 #[must_use]
 pub struct DeletionError;