From 731a4daf63dc0fdb784d195e89c5f357420657fb Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sat, 13 Jul 2013 16:28:42 -0400 Subject: A performance fix related to the usage of the :func:`.defer` option when loading mapped entities. The function overhead of applying a per-object deferred callable to an instance at load time was significantly higher than that of just loading the data from the row (note that ``defer()`` is meant to reduce DB/network overhead, not necessarily function call count); the function call overhead is now less than that of loading data from the column in all cases. There is also a reduction in the number of "lazy callable" objects created per load from N (total deferred values in the result) to 1 (total number of deferred cols). [ticket:2778] --- lib/sqlalchemy/orm/loading.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/sqlalchemy/orm/loading.py') diff --git a/lib/sqlalchemy/orm/loading.py b/lib/sqlalchemy/orm/loading.py index e1f4d1b7c..1641f509e 100644 --- a/lib/sqlalchemy/orm/loading.py +++ b/lib/sqlalchemy/orm/loading.py @@ -161,7 +161,7 @@ def get_from_identity(session, key, passive): # expired state will be checked soon enough, if necessary return instance try: - state(passive) + state(state, passive) except orm_exc.ObjectDeletedError: session._remove_newly_deleted([state]) return None -- cgit v1.2.1