ash-project/ash
1
0
Fork 0
mirror of https://github.com/ash-project/ash.git synced 2024-09-19 13:03:02 +12:00
Code Issues Projects Releases Packages Wiki Activity

improvement: optimize to avoid inspects in changesets

Browse source 
improvement: optimize to avoid expensive `String.valid?` check in uuid type
This commit is contained in:
Zach Daniel 2024-08-19 20:59:02 -04:00
parent d2d4be19fe
commit 29e3a35d4c
10 changed files with 124 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ash/actions/action.ex
View file

@ -43,7 +43,7 @@ defmodule Ash.Actions.Action do
Ash.Tracer.set_metadata(opts[:tracer], :action, metadata)
Ash.Tracer.telemetry_span fn -> [:ash, Ash.Domain.Info.short_name(domain), :create] end,
Ash.Tracer.telemetry_span [:ash, Ash.Domain.Info.short_name(domain), :create],
metadata do
if input.action.transaction? do
resources =

12
lib/ash/actions/aggregate.ex
View file

@ -65,13 +65,11 @@ defmodule Ash.Actions.Aggregate do
}
end
Ash.Tracer.telemetry_span fn ->
[
:ash,
Ash.Domain.Info.short_name(query.domain),
:aggregate
]
end,
Ash.Tracer.telemetry_span [
:ash,
Ash.Domain.Info.short_name(query.domain),
:aggregate
],
metadata do
Ash.Tracer.set_metadata(opts[:tracer], :action, metadata)

2
lib/ash/actions/create/create.ex
View file

@ -45,7 +45,7 @@ defmodule Ash.Actions.Create do
Ash.Tracer.set_metadata(opts[:tracer], :action, metadata)
Ash.Tracer.telemetry_span fn -> [:ash, Ash.Domain.Info.short_name(domain), :create] end,
Ash.Tracer.telemetry_span [:ash, Ash.Domain.Info.short_name(domain), :create],
metadata do
case do_run(domain, changeset, action, opts) do
{:error, error} ->

2
lib/ash/actions/destroy/destroy.ex
View file

@ -52,7 +52,7 @@ defmodule Ash.Actions.Destroy do
Ash.Tracer.set_metadata(opts[:tracer], :action, metadata)
Ash.Tracer.telemetry_span fn -> [:ash, Ash.Domain.Info.short_name(domain), :destroy] end,
Ash.Tracer.telemetry_span [:ash, Ash.Domain.Info.short_name(domain), :destroy],
metadata do
case do_run(domain, changeset, action, opts) do
{:error, error} ->

2
lib/ash/actions/read/read.ex
View file

@ -62,7 +62,7 @@ defmodule Ash.Actions.Read do
}
end
Ash.Tracer.telemetry_span fn -> [:ash, Ash.Domain.Info.short_name(query.domain), :read] end,
Ash.Tracer.telemetry_span [:ash, Ash.Domain.Info.short_name(query.domain), :read],
metadata do
Ash.Tracer.set_metadata(opts[:tracer], :action, metadata)

4
lib/ash/actions/update/update.ex
View file

@ -232,9 +232,7 @@ defmodule Ash.Actions.Update do
Ash.Tracer.set_metadata(opts[:tracer], :action, metadata)
Ash.Tracer.telemetry_span fn ->
[:ash, Ash.Domain.Info.short_name(domain), :update]
end,
Ash.Tracer.telemetry_span [:ash, Ash.Domain.Info.short_name(domain), :update],
metadata do
case do_run(domain, changeset, action, opts) do
{:error, error} ->

2
lib/ash/changeset/changeset.ex
View file

@ -3235,7 +3235,7 @@ defmodule Ash.Changeset do
end,
changeset.resource,
changeset.timeout,
"#{inspect(changeset.resource)}.#{changeset.action.name}",
fn -> "#{inspect(changeset.resource)}.#{changeset.action.name}" end,
opts[:tracer]
)
else

7
lib/ash/error/invalid/timeout.ex
View file

@ -5,6 +5,13 @@ defmodule Ash.Error.Invalid.Timeout do
use Splode.Error, fields: [:name, :timeout], class: :invalid
def message(%{name: name, timeout: timeout}) do
name =
if is_function(name) do
name.()
else
name
end
"""
#{name} timed out after #{timeout}ms.

39
lib/ash/tracer/tracer.ex
View file

@ -54,22 +54,22 @@ defmodule Ash.Tracer do
type = unquote(type)
name = unquote(name)
name =
if is_function(name) do
apply(name, [])
else
name
end
tracer = List.wrap(unquote(tracer))
tracer = Enum.filter(tracer, &Ash.Tracer.trace_type?(&1, type))
Ash.Tracer.start_span(tracer, type, name)
# no need to use try/rescue/after if no tracers
if Enum.empty?(tracer) do
unquote(block_opts[:do])
else
name =
if is_function(name) do
apply(name, [])
else
name
end
Ash.Tracer.start_span(tracer, type, name)
try do
unquote(block_opts[:do])
rescue
@ -87,20 +87,19 @@ defmodule Ash.Tracer do
quote generated: true do
telemetry_name = unquote(name)
telemetry_name =
if is_function(telemetry_name) do
apply(telemetry_name, [])
else
telemetry_name
end
metadata = unquote(metadata)
metadata =
if is_function(metadata) do
apply(metadata, [])
else
metadata
case :telemetry.list_handlers(telemetry_name) do
[] ->
%{}
_ ->
if is_function(metadata) do
apply(metadata, [])
else
metadata
end
end
start = System.monotonic_time()

94
lib/ash/type/uuid.ex
View file

@ -28,15 +28,40 @@ defmodule Ash.Type.UUID do
def cast_input(%Ash.CiString{string: string}, constraints), do: cast_input(string, constraints)
def cast_input(value, _) when is_binary(value) do
case String.valid?(value) do
true -> Ecto.Type.cast(Ecto.UUID, String.trim(value))
false -> Ecto.Type.cast(Ecto.UUID, value)
end
def cast_input(
<<a1, a2, a3, a4, a5, a6, a7, a8, ?-, b1, b2, b3, b4, ?-, c1, c2, c3, c4, ?-, d1, d2, d3,
d4, ?-, e1, e2, e3, e4, e5, e6, e7, e8, e9, e10, e11, e12>>,
_
) do
<<c(a1), c(a2), c(a3), c(a4), c(a5), c(a6), c(a7), c(a8), ?-, c(b1), c(b2), c(b3), c(b4), ?-,
c(c1), c(c2), c(c3), c(c4), ?-, c(d1), c(d2), c(d3), c(d4), ?-, c(e1), c(e2), c(e3), c(e4),
c(e5), c(e6), c(e7), c(e8), c(e9), c(e10), c(e11), c(e12)>>
catch
:error -> :error
else
hex_uuid -> {:ok, hex_uuid}
end
def cast_input(value, _) do
Ecto.Type.cast(Ecto.UUID, value)
def cast_input(<<_::128>> = raw_uuid, _),
do: {:ok, encode(raw_uuid)}
def cast_input(value, _) when is_binary(value) do
case String.trim(value) do
<<a1, a2, a3, a4, a5, a6, a7, a8, ?-, b1, b2, b3, b4, ?-, c1, c2, c3, c4, ?-, d1, d2, d3,
d4, ?-, e1, e2, e3, e4, e5, e6, e7, e8, e9, e10, e11, e12>> ->
try do
<<c(a1), c(a2), c(a3), c(a4), c(a5), c(a6), c(a7), c(a8), ?-, c(b1), c(b2), c(b3),
c(b4), ?-, c(c1), c(c2), c(c3), c(c4), ?-, c(d1), c(d2), c(d3), c(d4), ?-, c(e1),
c(e2), c(e3), c(e4), c(e5), c(e6), c(e7), c(e8), c(e9), c(e10), c(e11), c(e12)>>
catch
:error -> :error
else
hex_uuid -> {:ok, hex_uuid}
end
_ ->
:error
end
end
@impl true
@ -72,4 +97,59 @@ defmodule Ash.Type.UUID do
def dump_to_native(value, _) do
Ecto.Type.dump(Ecto.UUID, value)
end
@compile {:inline, c: 1}
defp c(?0), do: ?0
defp c(?1), do: ?1
defp c(?2), do: ?2
defp c(?3), do: ?3
defp c(?4), do: ?4
defp c(?5), do: ?5
defp c(?6), do: ?6
defp c(?7), do: ?7
defp c(?8), do: ?8
defp c(?9), do: ?9
defp c(?A), do: ?a
defp c(?B), do: ?b
defp c(?C), do: ?c
defp c(?D), do: ?d
defp c(?E), do: ?e
defp c(?F), do: ?f
defp c(?a), do: ?a
defp c(?b), do: ?b
defp c(?c), do: ?c
defp c(?d), do: ?d
defp c(?e), do: ?e
defp c(?f), do: ?f
defp c(_), do: throw(:error)
defp encode(
<<a1::4, a2::4, a3::4, a4::4, a5::4, a6::4, a7::4, a8::4, b1::4, b2::4, b3::4, b4::4,
c1::4, c2::4, c3::4, c4::4, d1::4, d2::4, d3::4, d4::4, e1::4, e2::4, e3::4, e4::4,
e5::4, e6::4, e7::4, e8::4, e9::4, e10::4, e11::4, e12::4>>
) do
<<e(a1), e(a2), e(a3), e(a4), e(a5), e(a6), e(a7), e(a8), ?-, e(b1), e(b2), e(b3), e(b4), ?-,
e(c1), e(c2), e(c3), e(c4), ?-, e(d1), e(d2), e(d3), e(d4), ?-, e(e1), e(e2), e(e3), e(e4),
e(e5), e(e6), e(e7), e(e8), e(e9), e(e10), e(e11), e(e12)>>
end
@compile {:inline, e: 1}
defp e(0), do: ?0
defp e(1), do: ?1
defp e(2), do: ?2
defp e(3), do: ?3
defp e(4), do: ?4
defp e(5), do: ?5
defp e(6), do: ?6
defp e(7), do: ?7
defp e(8), do: ?8
defp e(9), do: ?9
defp e(10), do: ?a
defp e(11), do: ?b
defp e(12), do: ?c
defp e(13), do: ?d
defp e(14), do: ?e
defp e(15), do: ?f
end