diff options
| -rw-r--r-- | lib/sqlalchemy/orm/loading.py | 8 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/session.py | 8 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/state.py | 30 | ||||
| -rw-r--r-- | test/aaa_profiling/test_orm.py | 2 |
4 files changed, 30 insertions, 18 deletions
diff --git a/lib/sqlalchemy/orm/loading.py b/lib/sqlalchemy/orm/loading.py index 8fb13b3a0..b0d1718e0 100644 --- a/lib/sqlalchemy/orm/loading.py +++ b/lib/sqlalchemy/orm/loading.py @@ -18,6 +18,7 @@ from . import attributes, exc as orm_exc from .interfaces import EXT_CONTINUE from ..sql import util as sql_util from .util import _none_set, state_str +statelib = util.importlater("sqlalchemy.orm", "state") _new_runid = util.counter() @@ -80,9 +81,10 @@ def instances(query, cursor, context): context.refresh_state.dict, query._only_load_props) context.progress.pop(context.refresh_state) - for state, dict_ in context.progress.items(): - state.commit_all(dict_, session.identity_map) - + statelib.InstanceState.commit_all_states( + context.progress.items(), + session.identity_map + ) for ii, (dict_, attrs) in context.partials.iteritems(): ii.commit(dict_, attrs) diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py index 1f302923d..9ce3c8628 100644 --- a/lib/sqlalchemy/orm/session.py +++ b/lib/sqlalchemy/orm/session.py @@ -21,7 +21,7 @@ from .util import ( from .unitofwork import UOWTransaction from .mapper import Mapper from .events import SessionEvents - +statelib = util.importlater("sqlalchemy.orm", "state") import sys __all__ = ['Session', 'SessionTransaction', 'SessionExtension'] @@ -1217,7 +1217,11 @@ class Session(object): state.key = instance_key self.identity_map.replace(state) - state.commit_all(state.dict, self.identity_map) + + statelib.InstanceState.commit_all_states( + ((state, state.dict) for state in states), + self.identity_map + ) self._register_altered(states) # remove from new last, might be the last strong ref diff --git a/lib/sqlalchemy/orm/state.py b/lib/sqlalchemy/orm/state.py index 52b29a99d..8333d6708 100644 --- a/lib/sqlalchemy/orm/state.py +++ b/lib/sqlalchemy/orm/state.py @@ -435,24 +435,30 @@ class InstanceState(object): - the "modified" flag is set to False - any "expired" markers/callables for attributes loaded are removed. - Attributes marked as "expired" can potentially remain "expired" after this step - if a value was not populated in state.dict. + Attributes marked as "expired" can potentially remain + "expired" after this step if a value was not populated in state.dict. """ + self.commit_all_states([(self, dict_)], instance_dict) - self.committed_state.clear() - self.__dict__.pop('_pending_mutations', None) + @classmethod + def commit_all_states(self, iter, instance_dict=None): + """Mass version of commit_all().""" + + for state, dict_ in iter: + state.committed_state.clear() + state.__dict__.pop('_pending_mutations', None) - callables = self.callables - for key in list(callables): - if key in dict_ and callables[key] is self: - del callables[key] + callables = state.callables + for key in list(callables): + if key in dict_ and callables[key] is state: + del callables[key] - if instance_dict and self.modified: - instance_dict._modified.discard(self) + if instance_dict and state.modified: + instance_dict._modified.discard(state) - self.modified = self.expired = False - self._strong_obj = None + state.modified = state.expired = False + state._strong_obj = None class InspectAttr(object): """Provide inspection interface to an object's state.""" diff --git a/test/aaa_profiling/test_orm.py b/test/aaa_profiling/test_orm.py index 2058b73c4..d66d2704d 100644 --- a/test/aaa_profiling/test_orm.py +++ b/test/aaa_profiling/test_orm.py @@ -70,7 +70,7 @@ class MergeTest(fixtures.MappedTest): # third call, merge object already present. almost no calls. @profiling.function_call_count(variance=0.05, - versions={'2.7':14, '2.6':14, '2.5':15, '3': 15}) + versions={'2.7':15, '2.6':15, '2.5':16, '3': 16}) def go(): return sess2.merge(p2, load=False) p3 = go() |