Skip to content

Commit 137df16

Browse files
authored
chore: unhide the --experimental-query-plan flag (#2842)
1 parent 11ba410 commit 137df16

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

docs/spicedb.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -514,6 +514,7 @@ spicedb serve [flags]
514514
--experimental-dispatch-secondary-upstream-addrs stringToString secondary upstream addresses for dispatches, each with a name (default [])
515515
--experimental-dispatch-secondary-upstream-exprs stringToString map from request type to its associated CEL expression, which returns the secondary upstream(s) to be used for the request (default [])
516516
--experimental-lookup-resources-version lr3 if non-empty, the version of the experimental lookup resources API to use: lr3 or empty
517+
--experimental-query-plan check if non-empty, the version of the experimental query plan to use: check or empty
517518
--grpc-addr string address to listen on to serve gRPC (default ":50051")
518519
--grpc-enabled enable gRPC gRPC server (default true)
519520
--grpc-log-requests-enabled enable logging of API request payloads

internal/services/v1/permissions_queryplan.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@ func (ps *permissionServer) checkPermissionWithQueryPlan(ctx context.Context, re
5252
return nil, ps.rewriteError(ctx, err)
5353
}
5454

55+
// Apply basic optimizations to the iterator tree
56+
it, _, err = query.ApplyOptimizations(it, query.StaticOptimizations)
57+
if err != nil {
58+
return nil, ps.rewriteError(ctx, err)
59+
}
60+
5561
// Parse caveat context if provided
5662
caveatContext, err := GetCaveatContext(ctx, req.Context, ps.config.MaxCaveatContextSize)
5763
if err != nil {

pkg/cmd/serve.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,6 @@ func RegisterServeFlags(cmd *cobra.Command, config *server.Config) error {
168168
experimentalFlags := nfs.FlagSet(BoldBlue("Experimental"))
169169
// Flags for experimental features
170170
experimentalFlags.StringVar(&config.ExperimentalQueryPlan, "experimental-query-plan", "", "if non-empty, the version of the experimental query plan to use: `check` or empty")
171-
if err := experimentalFlags.MarkHidden("experimental-query-plan"); err != nil {
172-
return fmt.Errorf("failed to mark flag as hidden: %w", err)
173-
}
174171
experimentalFlags.StringVar(&config.ExperimentalLookupResourcesVersion, "experimental-lookup-resources-version", "", "if non-empty, the version of the experimental lookup resources API to use: `lr3` or empty")
175172
experimentalFlags.BoolVar(&config.EnableRelationshipExpiration, "enable-experimental-relationship-expiration", true, "enables experimental support for relationship expiration")
176173
if err := experimentalFlags.MarkHidden("enable-experimental-relationship-expiration"); err != nil {

0 commit comments

Comments
 (0)