Skip to content

Commit 2d81311

Browse files
ldanilekConvex, Inc.
authored andcommitted
Query::get helper (#24653)
GitOrigin-RevId: 773fa66db05de620a829fbca7b2688ca25418e80
1 parent c5107d7 commit 2d81311

File tree

2 files changed

+14
-20
lines changed

2 files changed

+14
-20
lines changed

crates/common/src/query.rs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,6 +1118,17 @@ impl Query {
11181118
}
11191119
}
11201120

1121+
pub fn get(table_name: TableName, id: DeveloperDocumentId) -> Self {
1122+
Self::index_range(IndexRange {
1123+
index_name: IndexName::by_id(table_name),
1124+
range: vec![IndexRangeExpression::Eq(
1125+
ID_FIELD_PATH.clone(),
1126+
MaybeValue(Some(ConvexValue::from(id))),
1127+
)],
1128+
order: Order::Asc,
1129+
})
1130+
}
1131+
11211132
pub fn search(search: Search) -> Self {
11221133
Self {
11231134
source: QuerySource::Search(search),

crates/isolate/src/environment/udf/async_syscall.rs

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,12 @@ use std::{
1010

1111
use anyhow::Context;
1212
use common::{
13-
document::{
14-
GenericDocument,
15-
ID_FIELD_PATH,
16-
},
13+
document::GenericDocument,
1714
execution_context::ExecutionContext,
1815
knobs::MAX_SYSCALL_BATCH_SIZE,
19-
maybe_val,
2016
query::{
2117
Cursor,
2218
CursorPosition,
23-
IndexRange,
24-
IndexRangeExpression,
25-
Order,
2619
Query,
2720
},
2821
query_journal::QueryJournal,
@@ -31,10 +24,7 @@ use common::{
3124
RuntimeInstant,
3225
UnixTimestamp,
3326
},
34-
types::{
35-
IndexName,
36-
PersistenceVersion,
37-
},
27+
types::PersistenceVersion,
3828
value::ConvexValue,
3929
};
4030
use database::{
@@ -743,14 +733,7 @@ impl<RT: Runtime, P: AsyncSyscallProvider<RT>> DatabaseSyscallsV1<RT, P> {
743733
}
744734
match tx.resolve_idv6(id, table_filter) {
745735
Ok(table_name) => {
746-
let query = Query::index_range(IndexRange {
747-
index_name: IndexName::by_id(table_name),
748-
range: vec![IndexRangeExpression::Eq(
749-
ID_FIELD_PATH.clone(),
750-
maybe_val!(id.encode()),
751-
)],
752-
order: Order::Asc,
753-
});
736+
let query = Query::get(table_name, id);
754737
Some((
755738
None,
756739
DeveloperQuery::new_with_version(

0 commit comments

Comments
 (0)