-
Notifications
You must be signed in to change notification settings - Fork 184
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.
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
Torii grpc entities query #1196
Merged
Merged
Changes from all commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
7a27aa5
Refactor torii grpc
tarrencev 53d266b
Merge branch 'main' into toriigrpc2
broody a687c91
error freeeee!
broody 7916515
Refactor torii grpc
tarrencev 76e31b3
Move types to torii from dojo-types
broody e5b32cc
rebase changes
tarrencev 36e5b18
clean up
broody 1a1eb33
Move model to individual query clause
broody 5e984bb
Refactor subscription argument to keys
broody 0da6550
Add Torii grpc retrieve entities endpoint
broody 93d194a
Add cache to store schema ty and query
broody 0a33c58
Merge branch 'main' into grpc-entities-endpoint
broody 7f4d902
map rows to proto model
broody 2d77544
add grpc limit offset
broody c405284
refactor query logic
broody 9765aee
clippy & fmt
broody f3d8f56
remove unused
broody beb6801
fix tests
broody b28560a
move limit offset to query clause
broody File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
use std::collections::HashMap; | ||
|
||
use dojo_types::schema::Ty; | ||
use sqlx::SqlitePool; | ||
use tokio::sync::RwLock; | ||
|
||
use crate::error::{Error, QueryError}; | ||
use crate::model::{parse_sql_model_members, SqlModelMember}; | ||
|
||
type ModelName = String; | ||
|
||
pub struct ModelCache { | ||
pool: SqlitePool, | ||
schemas: RwLock<HashMap<ModelName, Ty>>, | ||
} | ||
|
||
impl ModelCache { | ||
pub fn new(pool: SqlitePool) -> Self { | ||
Self { pool, schemas: RwLock::new(HashMap::new()) } | ||
} | ||
|
||
pub async fn schema(&self, model: &str) -> Result<Ty, Error> { | ||
{ | ||
let schemas = self.schemas.read().await; | ||
if let Some(schema) = schemas.get(model) { | ||
return Ok(schema.clone()); | ||
} | ||
} | ||
|
||
self.update_schema(model).await | ||
} | ||
|
||
async fn update_schema(&self, model: &str) -> Result<Ty, Error> { | ||
let model_members: Vec<SqlModelMember> = sqlx::query_as( | ||
"SELECT id, model_idx, member_idx, name, type, type_enum, enum_options, key FROM \ | ||
model_members WHERE model_id = ? ORDER BY model_idx ASC, member_idx ASC", | ||
) | ||
.bind(model) | ||
.fetch_all(&self.pool) | ||
.await?; | ||
|
||
if model_members.is_empty() { | ||
return Err(QueryError::ModelNotFound(model.into()).into()); | ||
} | ||
|
||
let ty = parse_sql_model_members(model, &model_members); | ||
let mut schemas = self.schemas.write().await; | ||
schemas.insert(model.into(), ty.clone()); | ||
|
||
Ok(ty) | ||
} | ||
|
||
pub async fn clear(&self) { | ||
self.schemas.write().await.clear(); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we will eventually need a way to invalidate a cache entry when we index an update to an existing model. Lets create an issue to track it