Skip to content

Commit 081aec5

Browse files
miparnisarimiparnisari
committed
chore: add ctx to RevisionedReader.ReadSchema()
1 parent bf30728 commit 081aec5

31 files changed

+74
-74
lines changed

‎internal/caveats/run_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ func TestRunCaveatExpressions(t *testing.T) {
471471
req.NoError(err)
472472

473473
dl := datalayer.NewDataLayer(ds)
474-
sr, err := dl.SnapshotReader(headRevision).ReadSchema()
474+
sr, err := dl.SnapshotReader(headRevision).ReadSchema(t.Context())
475475
req.NoError(err)
476476

477477
for _, debugOption := range []RunCaveatExpressionDebugOption{
@@ -524,7 +524,7 @@ func TestRunCaveatWithMissingMap(t *testing.T) {
524524
req.NoError(err)
525525

526526
dl := datalayer.NewDataLayer(ds)
527-
sr, err := dl.SnapshotReader(headRevision).ReadSchema()
527+
sr, err := dl.SnapshotReader(headRevision).ReadSchema(t.Context())
528528
req.NoError(err)
529529

530530
result, err := RunSingleCaveatExpression(
@@ -556,7 +556,7 @@ func TestRunCaveatWithEmptyMap(t *testing.T) {
556556
req.NoError(err)
557557

558558
dl := datalayer.NewDataLayer(ds)
559-
sr, err := dl.SnapshotReader(headRevision).ReadSchema()
559+
sr, err := dl.SnapshotReader(headRevision).ReadSchema(t.Context())
560560
req.NoError(err)
561561

562562
_, err = RunSingleCaveatExpression(
@@ -594,7 +594,7 @@ func TestRunCaveatMultipleTimes(t *testing.T) {
594594
req.NoError(err)
595595

596596
dl := datalayer.NewDataLayer(ds)
597-
sr, err := dl.SnapshotReader(headRevision).ReadSchema()
597+
sr, err := dl.SnapshotReader(headRevision).ReadSchema(t.Context())
598598
req.NoError(err)
599599

600600
runner := NewCaveatRunner(types.Default.TypeSet)
@@ -662,7 +662,7 @@ func TestRunCaveatWithMissingDefinition(t *testing.T) {
662662
req.NoError(err)
663663

664664
dl := datalayer.NewDataLayer(ds)
665-
sr, err := dl.SnapshotReader(headRevision).ReadSchema()
665+
sr, err := dl.SnapshotReader(headRevision).ReadSchema(t.Context())
666666
req.NoError(err)
667667

668668
// Try to run a caveat that doesn't exist
@@ -697,7 +697,7 @@ func TestCaveatRunnerPopulateCaveatDefinitionsForExpr(t *testing.T) {
697697
req.NoError(err)
698698

699699
dl := datalayer.NewDataLayer(ds)
700-
sr, err := dl.SnapshotReader(headRevision).ReadSchema()
700+
sr, err := dl.SnapshotReader(headRevision).ReadSchema(t.Context())
701701
req.NoError(err)
702702

703703
runner := NewCaveatRunner(types.Default.TypeSet)
@@ -742,7 +742,7 @@ func TestCaveatRunnerEmptyExpression(t *testing.T) {
742742
req.NoError(err)
743743

744744
dl := datalayer.NewDataLayer(ds)
745-
sr, err := dl.SnapshotReader(headRevision).ReadSchema()
745+
sr, err := dl.SnapshotReader(headRevision).ReadSchema(t.Context())
746746
req.NoError(err)
747747

748748
runner := NewCaveatRunner(types.Default.TypeSet)
@@ -823,7 +823,7 @@ func TestUnknownCaveatOperation(t *testing.T) {
823823
req.NoError(err)
824824

825825
dl := datalayer.NewDataLayer(ds)
826-
sr, err := dl.SnapshotReader(headRevision).ReadSchema()
826+
sr, err := dl.SnapshotReader(headRevision).ReadSchema(t.Context())
827827
req.NoError(err)
828828

829829
runner := NewCaveatRunner(types.Default.TypeSet)

‎internal/dispatch/graph/graph.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ func (ld *localDispatcher) loadNamespace(ctx context.Context, nsName string, rev
207207
reader := datalayer.MustFromContext(ctx).SnapshotReader(revision)
208208

209209
// Load namespace and relation from the datastore
210-
schemaReader, err := reader.ReadSchema()
210+
schemaReader, err := reader.ReadSchema(ctx)
211211
if err != nil {
212212
return nil, rewriteNamespaceError(err)
213213
}

‎internal/dispatch/keys/keys.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ func (c *CanonicalKeyHandler) CheckCacheKey(ctx context.Context, req *v1.Dispatc
108108
}
109109
r := dl.SnapshotReader(revision)
110110

111-
sr, err := r.ReadSchema()
111+
sr, err := r.ReadSchema(ctx)
112112
if err != nil {
113113
return emptyDispatchCacheKey, err
114114
}

‎internal/graph/check.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,7 @@ func (cc *ConcurrentChecker) checkComputedUserset(ctx context.Context, crc curre
659659
// the same namespace as the caller, and thus must be fully typed checked.
660660
if cu.Object == core.ComputedUserset_TUPLE_USERSET_OBJECT {
661661
dl := datalayer.MustFromContext(ctx).SnapshotReader(crc.parentReq.Revision)
662-
sr, err := dl.ReadSchema()
662+
sr, err := dl.ReadSchema(ctx)
663663
if err != nil {
664664
return checkResultError(err, emptyMetadata)
665665
}
@@ -698,7 +698,7 @@ type Traits struct {
698698
// types of the given relation support caveats or expiration.
699699
func TraitsForArrowRelation(ctx context.Context, reader datalayer.RevisionedReader, namespaceName string, relationName string) (Traits, error) {
700700
// TODO(jschorr): Change to use the type system once we wire it through Check dispatch.
701-
schemaReader, err := reader.ReadSchema()
701+
schemaReader, err := reader.ReadSchema(ctx)
702702
if err != nil {
703703
return Traits{}, err
704704
}

‎internal/graph/computed/computecheck.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ func computeCaveatedCheckResult(ctx context.Context, runner *cexpr.CaveatRunner,
179179

180180
dl := datalayer.MustFromContext(ctx)
181181
reader := dl.SnapshotReader(params.AtRevision)
182-
sr, err := reader.ReadSchema()
182+
sr, err := reader.ReadSchema(ctx)
183183
if err != nil {
184184
return nil, err
185185
}

‎internal/graph/expand.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ func (ce *ConcurrentExpander) expandComputedUserset(ctx context.Context, req Val
244244

245245
// Check if the target relation exists. If not, return nothing.
246246
dl := datalayer.MustFromContext(ctx).SnapshotReader(req.Revision)
247-
sr, err := dl.ReadSchema()
247+
sr, err := dl.ReadSchema(ctx)
248248
if err != nil {
249249
return expandError(err)
250250
}

‎internal/graph/lookupresources2.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ func (crr *CursoredLookupResources2) afterSameType(
128128
// Load the type system and reachability graph to find the entrypoints for the reachability.
129129
dl := datalayer.MustFromContext(ctx)
130130
reader := dl.SnapshotReader(req.Revision)
131-
sr, err := reader.ReadSchema()
131+
sr, err := reader.ReadSchema(ctx)
132132
if err != nil {
133133
return err
134134
}
@@ -363,7 +363,7 @@ func (crr *CursoredLookupResources2) redispatchOrReportOverDatabaseQuery(
363363
toBeHandled := make([]itemAndPostCursor[dispatchableResourcesSubjectMap2], 0)
364364
currentCursor := queryCursor
365365
caveatRunner := caveats.NewCaveatRunner(crr.caveatTypeSet)
366-
caveatSR, err := config.reader.ReadSchema()
366+
caveatSR, err := config.reader.ReadSchema(ctx)
367367
if err != nil {
368368
return nil, err
369369
}

‎internal/graph/lookupresources3.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ func (crr *CursoredLookupResources3) LookupResources3(req ValidatedLookupResourc
268268
// interfaces used by various suboperations of the lookup resources operation.
269269
dl := datalayer.MustFromContext(stream.Context())
270270
reader := dl.SnapshotReader(req.Revision)
271-
sr, err := reader.ReadSchema()
271+
sr, err := reader.ReadSchema(ctx)
272272
if err != nil {
273273
return err
274274
}
@@ -813,7 +813,7 @@ func (crr *CursoredLookupResources3) relationshipsIter(
813813

814814
// Start the new relationships chunk that we will fill as we iterate over the results.
815815
// It starts at the given dbCursor, which may be nil/empty if this is the first chunk.
816-
caveatSR, err := refs.reader.ReadSchema()
816+
caveatSR, err := refs.reader.ReadSchema(ctx)
817817
if err != nil {
818818
yieldError(err)
819819
return

‎internal/graph/lookupsubjects.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func (cl *ConcurrentLookupSubjects) LookupSubjects(
6969

7070
dl := datalayer.MustFromContext(ctx)
7171
reader := dl.SnapshotReader(req.Revision)
72-
sr, err := reader.ReadSchema()
72+
sr, err := reader.ReadSchema(ctx)
7373
if err != nil {
7474
return err
7575
}
@@ -199,7 +199,7 @@ func (cl *ConcurrentLookupSubjects) lookupViaComputed(
199199
cu *core.ComputedUserset,
200200
) error {
201201
dl := datalayer.MustFromContext(ctx).SnapshotReader(parentRequest.Revision)
202-
sr, err := dl.ReadSchema()
202+
sr, err := dl.ReadSchema(ctx)
203203
if err != nil {
204204
return err
205205
}
@@ -259,7 +259,7 @@ func lookupViaIntersectionTupleToUserset(
259259
ttu *core.FunctionedTupleToUserset,
260260
) error {
261261
dl := datalayer.MustFromContext(ctx).SnapshotReader(parentRequest.Revision)
262-
sr, err := dl.ReadSchema()
262+
sr, err := dl.ReadSchema(ctx)
263263
if err != nil {
264264
return err
265265
}
@@ -438,7 +438,7 @@ func lookupViaTupleToUserset[T relation](
438438
relationshipsBySubjectONR := mapz.NewMultiMap[tuple.ObjectAndRelation, tuple.Relationship]()
439439

440440
dl := datalayer.MustFromContext(ctx).SnapshotReader(parentRequest.Revision)
441-
sr, err := dl.ReadSchema()
441+
sr, err := dl.ReadSchema(ctx)
442442
if err != nil {
443443
return err
444444
}

‎internal/namespace/util_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ func TestCheckNamespaceAndRelations(t *testing.T) {
171171
require.NoError(t, err)
172172

173173
dl := datalayer.NewDataLayer(ds)
174-
sr, err := dl.SnapshotReader(rev).ReadSchema()
174+
sr, err := dl.SnapshotReader(rev).ReadSchema(t.Context())
175175
require.NoError(t, err)
176176

177177
err = namespace.CheckNamespaceAndRelations(t.Context(), tc.checks, sr)

0 commit comments

Comments
 (0)