Skip to content

Commit fd129ea

Browse files
TimDiekmannTimDiekmann
authored
BE-467: Remove Default impl from QueryTemporalAxesUnresolved (#8900)
1 parent 3dbbe7b commit fd129ea

32 files changed

Lines changed: 214 additions & 519 deletions

File tree

‎libs/@local/graph/postgres-store/src/store/postgres/knowledge/entity/mod.rs‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -685,10 +685,7 @@ where
685685
entities
686686
.iter()
687687
.map(|entity| entity.metadata.entity_type_ids.clone()),
688-
QueryTemporalAxesUnresolved::DecisionTime {
689-
pinned: PinnedTemporalAxisUnresolved::new(None),
690-
variable: VariableTemporalAxisUnresolved::new(None, None),
691-
},
688+
QueryTemporalAxesUnresolved::live_only(),
692689
None,
693690
)
694691
.await?
@@ -1527,10 +1524,7 @@ where
15271524
.entities
15281525
.values()
15291526
.map(|entity| entity.metadata.entity_type_ids.clone()),
1530-
QueryTemporalAxesUnresolved::DecisionTime {
1531-
pinned: PinnedTemporalAxisUnresolved::new(None),
1532-
variable: VariableTemporalAxisUnresolved::new(None, None),
1533-
},
1527+
QueryTemporalAxesUnresolved::live_only(),
15341528
None,
15351529
)
15361530
.await?

‎libs/@local/graph/postgres-store/src/store/postgres/ontology/data_type.rs‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,7 @@ use hash_graph_store::{
2727
TraversalEdge,
2828
},
2929
identifier::{DataTypeVertexId, GraphElementVertexId},
30-
temporal_axes::{
31-
PinnedTemporalAxisUnresolved, QueryTemporalAxes, QueryTemporalAxesUnresolved,
32-
VariableAxis, VariableTemporalAxisUnresolved,
33-
},
30+
temporal_axes::{QueryTemporalAxes, QueryTemporalAxesUnresolved, VariableAxis},
3431
},
3532
};
3633
use hash_graph_temporal_versioning::{RightBoundedTemporalInterval, Timestamp, TransactionTime};
@@ -625,10 +622,7 @@ where
625622
parameters: ParameterList::DataTypeIds(&required_reference_ids),
626623
},
627624
),
628-
temporal_axes: QueryTemporalAxesUnresolved::DecisionTime {
629-
pinned: PinnedTemporalAxisUnresolved::new(None),
630-
variable: VariableTemporalAxisUnresolved::new(None, None),
631-
},
625+
temporal_axes: QueryTemporalAxesUnresolved::live_only(),
632626
after: None,
633627
limit: None,
634628
include_count: false,
@@ -1055,10 +1049,7 @@ where
10551049
parameters: ParameterList::DataTypeIds(&required_parent_ids),
10561050
},
10571051
),
1058-
temporal_axes: QueryTemporalAxesUnresolved::DecisionTime {
1059-
pinned: PinnedTemporalAxisUnresolved::new(None),
1060-
variable: VariableTemporalAxisUnresolved::new(None, None),
1061-
},
1052+
temporal_axes: QueryTemporalAxesUnresolved::live_only(),
10621053
after: None,
10631054
limit: None,
10641055
include_count: false,
@@ -1599,11 +1590,7 @@ where
15991590
authenticated_actor: AuthenticatedActor,
16001591
params: HasPermissionForDataTypesParams<'_>,
16011592
) -> Result<HashSet<VersionedUrl>, Report<hash_graph_store::error::CheckPermissionError>> {
1602-
let temporal_axes = QueryTemporalAxesUnresolved::DecisionTime {
1603-
pinned: PinnedTemporalAxisUnresolved::new(None),
1604-
variable: VariableTemporalAxisUnresolved::new(None, None),
1605-
}
1606-
.resolve();
1593+
let temporal_axes = QueryTemporalAxesUnresolved::live_only().resolve();
16071594
let mut compiler = SelectCompiler::new(Some(&temporal_axes), true);
16081595

16091596
let data_type_uuids = params

‎libs/@local/graph/postgres-store/src/store/postgres/ontology/entity_type.rs‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,7 @@ use hash_graph_store::{
3232
SubgraphTraversalParams, TraversalEdge,
3333
},
3434
identifier::{EntityTypeVertexId, GraphElementVertexId, PropertyTypeVertexId},
35-
temporal_axes::{
36-
PinnedTemporalAxisUnresolved, QueryTemporalAxes, QueryTemporalAxesUnresolved,
37-
VariableAxis, VariableTemporalAxisUnresolved,
38-
},
35+
temporal_axes::{QueryTemporalAxes, QueryTemporalAxesUnresolved, VariableAxis},
3936
},
4037
};
4138
use hash_graph_temporal_versioning::{RightBoundedTemporalInterval, Timestamp, TransactionTime};
@@ -242,7 +239,7 @@ where
242239
traversal_paths: Vec::new(),
243240
request: QueryPropertyTypesParams {
244241
filter: Filter::for_property_type_uuids(&property_type_uuids),
245-
temporal_axes: QueryTemporalAxesUnresolved::default(),
242+
temporal_axes: QueryTemporalAxesUnresolved::all(),
246243
after: None,
247244
limit: None,
248245
include_count: false,
@@ -1005,10 +1002,7 @@ where
10051002
parameters: ParameterList::EntityTypeIds(&required_reference_ids),
10061003
},
10071004
),
1008-
temporal_axes: QueryTemporalAxesUnresolved::DecisionTime {
1009-
pinned: PinnedTemporalAxisUnresolved::new(None),
1010-
variable: VariableTemporalAxisUnresolved::new(None, None),
1011-
},
1005+
temporal_axes: QueryTemporalAxesUnresolved::live_only(),
10121006
after: None,
10131007
limit: None,
10141008
include_count: false,
@@ -1601,10 +1595,7 @@ where
16011595
parameters: ParameterList::EntityTypeIds(&required_reference_ids),
16021596
},
16031597
),
1604-
temporal_axes: QueryTemporalAxesUnresolved::DecisionTime {
1605-
pinned: PinnedTemporalAxisUnresolved::new(None),
1606-
variable: VariableTemporalAxisUnresolved::new(None, None),
1607-
},
1598+
temporal_axes: QueryTemporalAxesUnresolved::live_only(),
16081599
after: None,
16091600
limit: None,
16101601
include_count: false,
@@ -2051,11 +2042,7 @@ where
20512042
})
20522043
.collect()
20532044
} else {
2054-
let temporal_axes = QueryTemporalAxesUnresolved::DecisionTime {
2055-
pinned: PinnedTemporalAxisUnresolved::new(None),
2056-
variable: VariableTemporalAxisUnresolved::new(None, None),
2057-
}
2058-
.resolve();
2045+
let temporal_axes = QueryTemporalAxesUnresolved::live_only().resolve();
20592046
let mut compiler = SelectCompiler::new(Some(&temporal_axes), true);
20602047

20612048
let entity_type_uuids = params

‎libs/@local/graph/postgres-store/src/store/postgres/ontology/property_type.rs‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@ use hash_graph_store::{
2525
TraversalEdge,
2626
},
2727
identifier::{DataTypeVertexId, GraphElementVertexId, PropertyTypeVertexId},
28-
temporal_axes::{
29-
PinnedTemporalAxisUnresolved, QueryTemporalAxes, QueryTemporalAxesUnresolved,
30-
VariableAxis, VariableTemporalAxisUnresolved,
31-
},
28+
temporal_axes::{QueryTemporalAxes, QueryTemporalAxesUnresolved, VariableAxis},
3229
},
3330
};
3431
use hash_graph_temporal_versioning::{RightBoundedTemporalInterval, Timestamp, TransactionTime};
@@ -1152,11 +1149,7 @@ where
11521149
authenticated_actor: AuthenticatedActor,
11531150
params: HasPermissionForPropertyTypesParams<'_>,
11541151
) -> Result<HashSet<VersionedUrl>, Report<hash_graph_store::error::CheckPermissionError>> {
1155-
let temporal_axes = QueryTemporalAxesUnresolved::DecisionTime {
1156-
pinned: PinnedTemporalAxisUnresolved::new(None),
1157-
variable: VariableTemporalAxisUnresolved::new(None, None),
1158-
}
1159-
.resolve();
1152+
let temporal_axes = QueryTemporalAxesUnresolved::live_only().resolve();
11601153
let mut compiler = SelectCompiler::new(Some(&temporal_axes), true);
11611154

11621155
let property_type_uuids = params

‎libs/@local/graph/postgres-store/src/store/postgres/query/expression/where_clause.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ mod tests {
137137
#[test]
138138
#[expect(clippy::too_many_lines)]
139139
fn transpile_where_expression() {
140-
let temporal_axes = QueryTemporalAxesUnresolved::default().resolve();
140+
let temporal_axes = QueryTemporalAxesUnresolved::all().resolve();
141141
let mut compiler = SelectCompiler::<DataTypeWithMetadata>::new(Some(&temporal_axes), false);
142142
let mut where_clause = WhereExpression::default();
143143
assert_eq!(where_clause.transpile_to_string(), "");

0 commit comments

Comments
 (0)