Skip to content

Commit

Permalink
improvement: add show_keysets_for_all_actions? configuration
Browse files Browse the repository at this point in the history
It is quite expensive to load fields when they won't be used, and
ultimately it is unlikely that we will want to use the keyset retrieved
from an action that isn't performing keyset pagination.
  • Loading branch information
zachdaniel committed Dec 17, 2024
1 parent 1076e88 commit b9107f7
Show file tree
Hide file tree
Showing 3 changed files with 68 additions and 27 deletions.
1 change: 1 addition & 0 deletions config/config.exs
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ if Mix.env() == :test do
Ash.Test.Support.PolicySimple.Domain
]

config :ash, :show_keysets_for_all_actions?, false
config :ash, :policies, no_filter_static_forbidden_reads?: false

config :ash, :custom_expressions, [Ash.Test.Expressions.JaroDistance]
Expand Down
88 changes: 61 additions & 27 deletions lib/ash/actions/read/read.ex
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,12 @@ defmodule Ash.Actions.Read do
opts = Keyword.delete(opts, :page)
query = Ash.Query.page(query, page_opts)

query = load_and_select_sort(query)
query =
if opts[:initial_data] do
query
else
load_and_select_sort(query, page_opts)
end

query = add_relationship_count_aggregates(query)

Expand Down Expand Up @@ -2604,21 +2609,9 @@ defmodule Ash.Actions.Read do
end

paginated =
cond do
page_opts[:before] || page_opts[:after] ->
keyset_pagination(query, pagination, page_opts)

page_opts[:offset] ->
limit_offset_pagination(query, pagination, page_opts)

pagination.offset? && pagination.keyset? ->
keyset_pagination(query, pagination, page_opts)

pagination.offset? ->
limit_offset_pagination(query, pagination, page_opts)

true ->
keyset_pagination(query, pagination, page_opts)
case pagination_type(page_opts, query.action.pagination) do
:keyset -> keyset_pagination(query, pagination, page_opts)
:offset -> limit_offset_pagination(query, pagination, page_opts)
end

case paginated do
Expand All @@ -2634,6 +2627,30 @@ defmodule Ash.Actions.Read do
end
end

defp pagination_type(_page_opts, pagination) when pagination in [nil, false], do: nil

defp pagination_type(page_opts, pagination) do
cond do
!page_opts ->

Check warning on line 2634 in lib/ash/actions/read/read.ex

View workflow job for this annotation

GitHub Actions / ash-ci (Picosat) / mix dialyzer

guard_fail

The guard clause can never succeed.

Check warning on line 2634 in lib/ash/actions/read/read.ex

View workflow job for this annotation

GitHub Actions / ash-ci (Picosat) / mix dialyzer

pattern_match

The pattern can never match the type false.
nil

page_opts[:before] || page_opts[:after] ->
:keyset

page_opts[:offset] ->
:offset

pagination.keyset? ->
:keyset

pagination.offset? ->
:offset

true ->
nil
end
end

defp keyset_pagination(query, pagination, opts) do
limited = Ash.Query.limit(query, limit(query, opts[:limit], query.limit, pagination) + 1)

Expand Down Expand Up @@ -2677,18 +2694,35 @@ defmodule Ash.Actions.Read do
end
end

defp load_and_select_sort(query) do
query.resource
|> Ash.Resource.Info.actions()
|> Enum.any?(&match?(%{pagination: %{keyset?: true}}, &1))
|> if do
query.sort
|> Enum.map(&elem(&1, 0))
|> then(fn load ->
Ash.Query.load(query, load)
end)
defp load_and_select_sort(query, page_opts) do
if Application.get_env(:ash, :show_keysets_for_all_actions?, true) do
# in 4.0 remove this branch
show_keyset? =
query.resource
|> Ash.Resource.Info.actions()
|> Enum.any?(&match?(%{pagination: %{keyset?: true}}, &1))

if show_keyset? do
query.sort
|> Enum.map(&elem(&1, 0))
|> then(fn load ->
Ash.Query.load(query, load)
end)
else
false
end
else
query
case pagination_type(page_opts, query.action.pagination) do
:keyset ->
query.sort
|> Enum.map(&elem(&1, 0))
|> then(fn load ->
Ash.Query.load(query, load)
end)

_ ->
query
end
end
end

Expand Down
6 changes: 6 additions & 0 deletions lib/mix/tasks/install/ash.install.ex
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,12 @@ defmodule Mix.Tasks.Ash.Install do
[:include_embedded_source_by_default?],
false
)
|> Igniter.Project.Config.configure(
"config.exs",
:ash,
[:show_keysets_for_all_actions?],
false
)
|> Igniter.Project.Config.configure(
"config.exs",
:ash,
Expand Down

0 comments on commit b9107f7

Please sign in to comment.