Metastore on sqlite

Cargo.toml

@@ -104,6 +104,8 @@ insta = { version = "1.42.0", features = ["json", "filters", "redactions"] }
 cfg-if = { version = "1.0.3" }
 rusqlite = { version = "0.37.0", features = ["blob", "trace", "bundled"] }
 deadpool-sqlite = { version = "0.12.1", features = ["tracing"] }
+deadpool = { version = "0.12.3" }
+deadpool-diesel = {  version = "0.6.1", features = ["sqlite", "tracing"] }
 
 [patch.crates-io]
 datafusion = { git = "https://github.com/Embucket/datafusion.git", rev = "832c278922863064571c0a7c5716a3ff87ce5201" }

crates/api-iceberg-rest/src/error.rs

@@ -56,6 +56,7 @@ impl IntoResponse for Error {
         fields(status_code),
         skip(self)
     )]
+    #[allow(clippy::match_same_arms)]
     fn into_response(self) -> axum::response::Response {
         tracing::error!(error_message = %self.output_msg(), "Iceberg API error");
         let metastore_error = match self {
@@ -87,16 +88,10 @@ impl IntoResponse for Error {
             | core_metastore::Error::TableNotFound { .. }
             | core_metastore::Error::ObjectNotFound { .. } => http::StatusCode::NOT_FOUND,
             core_metastore::Error::ObjectStore { .. }
-            | core_metastore::Error::ObjectStorePath { .. }
-            | core_metastore::Error::CreateDirectory { .. }
-            | core_metastore::Error::SlateDB { .. }
-            | core_metastore::Error::UtilSlateDB { .. }
-            | core_metastore::Error::Iceberg { .. }
-            | core_metastore::Error::IcebergSpec { .. }
-            | core_metastore::Error::Serde { .. }
-            | core_metastore::Error::TableMetadataBuilder { .. }
-            | core_metastore::Error::TableObjectStoreNotFound { .. }
-            | core_metastore::Error::UrlParse { .. } => http::StatusCode::INTERNAL_SERVER_ERROR,
+            | core_metastore::Error::ObjectStorePath { .. } => {
+                http::StatusCode::INTERNAL_SERVER_ERROR
+            }
+            _ => http::StatusCode::INTERNAL_SERVER_ERROR,
         };
 
         // Record the result as part of the current span.

crates/api-iceberg-rest/src/handlers.rs

@@ -7,7 +7,9 @@ use crate::state::State as AppState;
 use axum::http::StatusCode;
 use axum::{Json, extract::Path, extract::Query, extract::State};
 use core_metastore::error::{self as metastore_error};
-use core_metastore::{SchemaIdent as MetastoreSchemaIdent, TableIdent as MetastoreTableIdent};
+use core_metastore::{
+    ListParams, SchemaIdent as MetastoreSchemaIdent, TableIdent as MetastoreTableIdent,
+};
 use core_utils::scan_iterator::ScanIterator;
 use iceberg_rest_catalog::models::{
     CatalogConfig, CommitTableResponse, CreateNamespaceRequest, CreateNamespaceResponse,
@@ -94,10 +96,8 @@ pub async fn list_namespaces(
 ) -> Result<Json<ListNamespacesResponse>> {
     let schemas = state
         .metastore
-        .iter_schemas(&database_name)
-        .collect()
+        .get_schemas(ListParams::default().by_parent_name(database_name.clone()))
         .await
-        .context(metastore_error::UtilSlateDBSnafu)
         .context(api_iceberg_rest_error::MetastoreSnafu {
             operation: Operation::ListNamespaces,
         })?;

crates/api-iceberg-rest/src/state.rs

@@ -1,4 +1,4 @@
-use core_metastore::metastore::Metastore;
+use core_metastore::Metastore;
 use std::sync::Arc;
 
 use serde::{Deserialize, Serialize};

crates/api-snowflake-rest/Cargo.toml

@@ -17,7 +17,6 @@ default-server = [
     "dep:tower-http",
     "dep:axum",
     "dep:snafu",
-    "dep:tracing",
     "dep:flate2",
     "dep:indexmap",
     "dep:datafusion",
@@ -36,12 +35,12 @@ error-stack-trace = { path = "../error-stack-trace" }
 error-stack = { path = "../error-stack" }
 
 tracing-subscriber = { version = "0.3.20", features = ["env-filter", "registry", "fmt", "json"] }
+tracing = { workspace = true }
 
 tower-sessions = { workspace = true, optional = true }
 tower-http = { workspace = true, optional = true }
 axum = { workspace = true, optional = true }
 snafu = { workspace = true, optional = true }
-tracing = { workspace = true, optional = true }
 flate2 = { version = "1", optional = true}
 indexmap = { workspace = true, optional = true }
 base64 = { version = "0.22" }
@@ -55,6 +54,8 @@ time = { workspace = true }
 uuid = { workspace = true }
 tokio = { workspace = true }
 cfg-if = { workspace = true }
+axum-server = "0.7.2"
+futures = "0.3.31"
 
 [dev-dependencies]
 insta = { workspace = true }

crates/api-snowflake-rest/src/server/handlers.rs

@@ -144,8 +144,9 @@ pub async fn abort(
         request_id,
     }): Json<AbortRequestBody>,
 ) -> Result<Json<serde_json::value::Value>> {
-    state
+    let _query_status = state
         .execution_svc
-        .abort_query(RunningQueryId::ByRequestId(request_id, sql_text))?;
+        .abort_query(RunningQueryId::ByRequestId(request_id, sql_text))
+        .await?;
     Ok(Json(serde_json::value::Value::Null))
 }