Skip to content

feat: in-memory resource store #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roeap merged 1 commit into from
Feb 22, 2025
Merged

feat: in-memory resource store #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion buf.gen.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ plugins:
- type_attribute=.delta_sharing.internal.Resource.resource=#[derive(::strum::EnumDiscriminants)]
- type_attribute=.delta_sharing.internal.Resource.resource=#[strum_discriminants(name(ObjectLabel))]
- type_attribute=.delta_sharing.internal.Resource.resource=#[strum_discriminants(derive(::strum::AsRefStr\, ::strum::Display\, ::strum::EnumIter\, ::strum::EnumString)\, strum(serialize_all = "snake_case"))]
- type_attribute=.delta_sharing.internal.Resource.resource=#[strum_discriminants(derive(::serde::Serialize\, ::serde::Deserialize))]
- type_attribute=.delta_sharing.internal.Resource.resource=#[strum_discriminants(derive(::serde::Serialize\, ::serde::Deserialize\, Hash))]
- type_attribute=.delta_sharing.internal.Resource.resource=#[strum_discriminants(serde(rename_all = "snake_case"))]
- type_attribute=.delta_sharing.internal.Resource.resource=#[strum_discriminants(cfg_attr(feature = "sqlx"\, derive(::sqlx::Type)))]
- type_attribute=.delta_sharing.internal.Resource.resource=#[strum_discriminants(cfg_attr(feature = "sqlx"\, sqlx(type_name = "object_label"\, rename_all = "snake_case")))]
Expand Down
17 changes: 15 additions & 2 deletions delta-sharing/cli/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ use std::sync::Arc;
use chrono::Days;
use clap::{Parser, Subcommand};
use delta_sharing_common::{
rest::AnonymousAuthenticator, ConstantPolicy, KernelQueryHandler, ServerHandler,
memory::InMemoryResourceStore, rest::AnonymousAuthenticator, ConstantPolicy,
KernelQueryHandler, ServerHandler,
};
use delta_sharing_postgres::GraphStore;
use delta_sharing_profiles::{DefaultClaims, DeltaProfileManager, ProfileManager, TokenManager};
Expand Down Expand Up @@ -129,6 +130,15 @@ async fn get_db_handler() -> Result<ServerHandler> {
Ok(handler)
}

fn get_memory_handler() -> ServerHandler {
let store = Arc::new(InMemoryResourceStore::new());
ServerHandler {
query: KernelQueryHandler::new_multi_thread(store.clone(), Default::default()),
store,
policy: Arc::new(ConstantPolicy::default()),
}
}

fn init_tracing() {
tracing_subscriber::registry()
.with(
Expand Down Expand Up @@ -158,7 +168,10 @@ async fn handle_rest(args: ServerArgs) -> Result<()> {
.await
.map_err(|_| Error::Generic("Server failed".to_string()))
} else {
todo!()
let handler = get_memory_handler();
run_rest_server_full(args.host, args.port, handler, AnonymousAuthenticator)
.await
.map_err(|_| Error::Generic("Server failed".to_string()))
}
}

Expand Down
4 changes: 2 additions & 2 deletions delta-sharing/common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ paste = "1.0"

# in-memory handler dependencies (in alphabetical order)
dashmap = { version = "6", optional = true }
uuid = { version = "1.8", features = ["v5"] }
uuid = { version = "1.8" }

# axum handler dependencies (in alphabetical order)
axum = { version = "0.8", optional = true }
Expand All @@ -54,7 +54,7 @@ uuid = { version = "1.8", features = ["v4"] }

[features]
default = ["memory", "axum", "grpc"]
memory = ["dashmap", "uuid/v5"]
memory = ["dashmap", "uuid/v7"]
axum = ["dep:axum", "http", "tower"]

# The grpc features provides implementations to support
Expand Down
28 changes: 14 additions & 14 deletions delta-sharing/common/src/gen/delta_sharing.catalog.v1.serde.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ impl<'de> serde::Deserialize<'de> for CatalogInfo {
{
struct GeneratedVisitor;

impl serde::de::Visitor<'_> for GeneratedVisitor {
impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
type Value = GeneratedField;

fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
Expand Down Expand Up @@ -298,7 +298,7 @@ impl<'de> serde::Deserialize<'de> for CreateCatalogRequest {
{
struct GeneratedVisitor;

impl serde::de::Visitor<'_> for GeneratedVisitor {
impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
type Value = GeneratedField;

fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
Expand Down Expand Up @@ -436,7 +436,7 @@ impl<'de> serde::Deserialize<'de> for CreateSchemaRequest {
{
struct GeneratedVisitor;

impl serde::de::Visitor<'_> for GeneratedVisitor {
impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
type Value = GeneratedField;

fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
Expand Down Expand Up @@ -566,7 +566,7 @@ impl<'de> serde::Deserialize<'de> for DeleteCatalogRequest {
{
struct GeneratedVisitor;

impl serde::de::Visitor<'_> for GeneratedVisitor {
impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
type Value = GeneratedField;

fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
Expand Down Expand Up @@ -679,7 +679,7 @@ impl<'de> serde::Deserialize<'de> for DeleteSchemaRequest {
{
struct GeneratedVisitor;

impl serde::de::Visitor<'_> for GeneratedVisitor {
impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
type Value = GeneratedField;

fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
Expand Down Expand Up @@ -783,7 +783,7 @@ impl<'de> serde::Deserialize<'de> for GetCatalogRequest {
{
struct GeneratedVisitor;

impl serde::de::Visitor<'_> for GeneratedVisitor {
impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
type Value = GeneratedField;

fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
Expand Down Expand Up @@ -879,7 +879,7 @@ impl<'de> serde::Deserialize<'de> for GetSchemaRequest {
{
struct GeneratedVisitor;

impl serde::de::Visitor<'_> for GeneratedVisitor {
impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
type Value = GeneratedField;

fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
Expand Down Expand Up @@ -984,7 +984,7 @@ impl<'de> serde::Deserialize<'de> for ListCatalogsRequest {
{
struct GeneratedVisitor;

impl serde::de::Visitor<'_> for GeneratedVisitor {
impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
type Value = GeneratedField;

fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
Expand Down Expand Up @@ -1099,7 +1099,7 @@ impl<'de> serde::Deserialize<'de> for ListCatalogsResponse {
{
struct GeneratedVisitor;

impl serde::de::Visitor<'_> for GeneratedVisitor {
impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
type Value = GeneratedField;

fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
Expand Down Expand Up @@ -1222,7 +1222,7 @@ impl<'de> serde::Deserialize<'de> for ListSchemasRequest {
{
struct GeneratedVisitor;

impl serde::de::Visitor<'_> for GeneratedVisitor {
impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
type Value = GeneratedField;

fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
Expand Down Expand Up @@ -1346,7 +1346,7 @@ impl<'de> serde::Deserialize<'de> for ListSchemasResponse {
{
struct GeneratedVisitor;

impl serde::de::Visitor<'_> for GeneratedVisitor {
impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
type Value = GeneratedField;

fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
Expand Down Expand Up @@ -1541,7 +1541,7 @@ impl<'de> serde::Deserialize<'de> for SchemaInfo {
{
struct GeneratedVisitor;

impl serde::de::Visitor<'_> for GeneratedVisitor {
impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
type Value = GeneratedField;

fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
Expand Down Expand Up @@ -1755,7 +1755,7 @@ impl<'de> serde::Deserialize<'de> for UpdateCatalogRequest {
{
struct GeneratedVisitor;

impl serde::de::Visitor<'_> for GeneratedVisitor {
impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
type Value = GeneratedField;

fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
Expand Down Expand Up @@ -1903,7 +1903,7 @@ impl<'de> serde::Deserialize<'de> for UpdateSchemaRequest {
{
struct GeneratedVisitor;

impl serde::de::Visitor<'_> for GeneratedVisitor {
impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
type Value = GeneratedField;

fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
Expand Down
30 changes: 15 additions & 15 deletions delta-sharing/common/src/gen/delta_sharing.credentials.v1.serde.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ impl<'de> serde::Deserialize<'de> for AzureClientCredential {
{
struct GeneratedVisitor;

impl serde::de::Visitor<'_> for GeneratedVisitor {
impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
type Value = GeneratedField;

fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
Expand Down Expand Up @@ -216,7 +216,7 @@ impl<'de> serde::Deserialize<'de> for AzureCredential {
{
struct GeneratedVisitor;

impl serde::de::Visitor<'_> for GeneratedVisitor {
impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
type Value = GeneratedField;

fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
Expand Down Expand Up @@ -338,7 +338,7 @@ impl<'de> serde::Deserialize<'de> for AzureKeyCredential {
{
struct GeneratedVisitor;

impl serde::de::Visitor<'_> for GeneratedVisitor {
impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
type Value = GeneratedField;

fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
Expand Down Expand Up @@ -452,7 +452,7 @@ impl<'de> serde::Deserialize<'de> for AzureSasCredential {
{
struct GeneratedVisitor;

impl serde::de::Visitor<'_> for GeneratedVisitor {
impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
type Value = GeneratedField;

fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
Expand Down Expand Up @@ -556,7 +556,7 @@ impl<'de> serde::Deserialize<'de> for CreateCredentialRequest {
{
struct GeneratedVisitor;

impl serde::de::Visitor<'_> for GeneratedVisitor {
impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
type Value = GeneratedField;

fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
Expand Down Expand Up @@ -651,7 +651,7 @@ impl<'de> serde::Deserialize<'de> for CreateStorageLocationRequest {
{
struct GeneratedVisitor;

impl serde::de::Visitor<'_> for GeneratedVisitor {
impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
type Value = GeneratedField;

fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
Expand Down Expand Up @@ -814,7 +814,7 @@ impl<'de> serde::Deserialize<'de> for Credential {
{
struct GeneratedVisitor;

impl serde::de::Visitor<'_> for GeneratedVisitor {
impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
type Value = GeneratedField;

fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
Expand Down Expand Up @@ -977,7 +977,7 @@ impl<'de> serde::Deserialize<'de> for DeleteCredentialRequest {
{
struct GeneratedVisitor;

impl serde::de::Visitor<'_> for GeneratedVisitor {
impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
type Value = GeneratedField;

fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
Expand Down Expand Up @@ -1072,7 +1072,7 @@ impl<'de> serde::Deserialize<'de> for DeleteStorageLocationRequest {
{
struct GeneratedVisitor;

impl serde::de::Visitor<'_> for GeneratedVisitor {
impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
type Value = GeneratedField;

fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
Expand Down Expand Up @@ -1167,7 +1167,7 @@ impl<'de> serde::Deserialize<'de> for GetCredentialRequest {
{
struct GeneratedVisitor;

impl serde::de::Visitor<'_> for GeneratedVisitor {
impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
type Value = GeneratedField;

fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
Expand Down Expand Up @@ -1262,7 +1262,7 @@ impl<'de> serde::Deserialize<'de> for GetStorageLocationRequest {
{
struct GeneratedVisitor;

impl serde::de::Visitor<'_> for GeneratedVisitor {
impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
type Value = GeneratedField;

fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
Expand Down Expand Up @@ -1367,7 +1367,7 @@ impl<'de> serde::Deserialize<'de> for ListStorageLocationsRequest {
{
struct GeneratedVisitor;

impl serde::de::Visitor<'_> for GeneratedVisitor {
impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
type Value = GeneratedField;

fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
Expand Down Expand Up @@ -1483,7 +1483,7 @@ impl<'de> serde::Deserialize<'de> for ListStorageLocationsResponse {
{
struct GeneratedVisitor;

impl serde::de::Visitor<'_> for GeneratedVisitor {
impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
type Value = GeneratedField;

fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
Expand Down Expand Up @@ -1637,7 +1637,7 @@ impl<'de> serde::Deserialize<'de> for StorageLocation {
{
struct GeneratedVisitor;

impl serde::de::Visitor<'_> for GeneratedVisitor {
impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
type Value = GeneratedField;

fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
Expand Down Expand Up @@ -1776,7 +1776,7 @@ impl<'de> serde::Deserialize<'de> for StorageType {

struct GeneratedVisitor;

impl serde::de::Visitor<'_> for GeneratedVisitor {
impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
type Value = StorageType;

fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
Expand Down
2 changes: 1 addition & 1 deletion delta-sharing/common/src/gen/delta_sharing.internal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pub mod resource {
#[derive(::strum::EnumDiscriminants)]
#[strum_discriminants(name(ObjectLabel))]
#[strum_discriminants(derive(::strum::AsRefStr, ::strum::Display, ::strum::EnumIter, ::strum::EnumString), strum(serialize_all = "snake_case"))]
#[strum_discriminants(derive(::serde::Serialize, ::serde::Deserialize))]
#[strum_discriminants(derive(::serde::Serialize, ::serde::Deserialize, Hash))]
#[strum_discriminants(serde(rename_all = "snake_case"))]
#[strum_discriminants(cfg_attr(feature = "sqlx", derive(::sqlx::Type)))]
#[strum_discriminants(cfg_attr(feature = "sqlx", sqlx(type_name = "object_label", rename_all = "snake_case")))]
Expand Down
2 changes: 1 addition & 1 deletion delta-sharing/common/src/gen/delta_sharing.internal.serde.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ impl<'de> serde::Deserialize<'de> for Resource {
{
struct GeneratedVisitor;

impl serde::de::Visitor<'_> for GeneratedVisitor {
impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
type Value = GeneratedField;

fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
Expand Down
6 changes: 3 additions & 3 deletions delta-sharing/common/src/gen/delta_sharing.profiles.v1.serde.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ impl<'de> serde::Deserialize<'de> for CreateProfileRequest {
{
struct GeneratedVisitor;

impl serde::de::Visitor<'_> for GeneratedVisitor {
impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
type Value = GeneratedField;

fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
Expand Down Expand Up @@ -138,7 +138,7 @@ impl<'de> serde::Deserialize<'de> for CreateProfileResponse {
{
struct GeneratedVisitor;

impl serde::de::Visitor<'_> for GeneratedVisitor {
impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
type Value = GeneratedField;

fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
Expand Down Expand Up @@ -260,7 +260,7 @@ impl<'de> serde::Deserialize<'de> for Profile {
{
struct GeneratedVisitor;

impl serde::de::Visitor<'_> for GeneratedVisitor {
impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
type Value = GeneratedField;

fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
Expand Down
Loading
Loading