Browse files

Merge the ResultSource diagnostics rework

                            ...And this is what the products that we make do:
                            these are the consequences. They either empower
                            people, or they steal bits of their lives.
                            Because experiences are all we have in life:
                            if you think about them as grains of sand in an
                            hour glass, once those grains are gone – they are
                            gone. And experiences with people and experiences
                            with things: they use up the same grains.

                            That's why we have a profound responsibility to
                            respect the experiences of the people that we
                            build for...

                            -- Aral Balkan:  Free is a Lie  TNW 2014

This set of commits is unusual - the 2+kloc of changes (in lib/ alone) do not
add any new runtime functionality, nor do these changes alter significantly
any aspect of DBIC's runtime operation. Instead this is a culmination of a
nearly 4 months long death-march [1] ensuring the increasingly complex and
more frequent ( courtesy of rising use of Moo(se) ) failure modes can be
reasoned about and acted upon by ordinary users, without the need to reach
out to a support channel.

The changeset has been extensively tested against 247 downstream CPAN dists
(as described at the end of commit 12e7015) and against several darkpan
test suites. As of this merge there are no known issues except RT#114440 [2]
and a number of dists (enumerated in 12e7015) now emitting *REALLY LOUD*
though warranted and actionable, diagnostic messages.

The diagnostic is emitted directly on STDERR - this was a deliberate choice
designed to:

 1) prevent various test suites from failing due to unexpected warnings

 2) make the warnings *harder* to silence by a well meaning but often too
    eager-yet-not-sufficiently-dilligent staffer, before the warnings had
    a chance to reach a senior developer

What follows is a little bit of gory technical details on the commit series,
as the work is both generic/interesting enough to be applied to other large
scale systems, and is "clever" enough to not be easily reasoned about without
a summary. Think of this as a blog post within an unusual medium ;)


Some necessary history: DBIC as a project is rather old [3][4]. When it got
started Moose wasn't a thing. Neither (for perspective) was jQuery or even
Tw(i)tt(e)r. The software it was modeled on (Class::DBI) has "single-level"
metadata: you have one class per table, and columns/accessor were defined on
that class and that was it. At the time mst made the brilliant decision to
keep the original class-based API (so that the CDBI test suite can be reused
almost verbatim, see ea2e61b) while at the same time moving the metadata to
a "metaclass instance" of sorts. The way this worked was for each level of:

- Individual Result Class (class itself, not instance)
- Result Class attached to a Schema class
- Result Class attached to a Schema instance

to have a separate copy-on-the-spot created metadata instance object of
DBIx::Class::ResultSource. One can easily see this by executing:

~/dbic_checkout$ perl -Ilib -It/lib -MDBICTest -MData::Dumper -e '
  my $s = DBICTest->init_schema;
  $Data::Dumper::Maxdepth = 1;
  warn Dumper [

The technique (and ingenious design) worked great. The downside was that
nobody ever really audited the entire stack past the original implementation.
The codebase grew, and mistakes started to seep in: sometimes modifications
(add_columns, etc) would happen on a derivative metadata instance, while the
getters would still be invoked on the "parent" (which at this point was
oblivious of its "child" existence, and vice versa). In addition there was a
weird accessor split: given a result instance one could reach *different*
metadata instances via either result_source() or result_source_instance(). To
add insult to the injury the latter method is never defined anywhere, and was
always dynamically brought to life at runtime via an accessor maker call on
each individual class [5].

If that wasn't bad enough, some (but crucially *not* all) routines used to
manipulate resultsource metadata were proxied [6] to the main Result classes,
also aiming at allowing the reuse of the existing Class::DBI test suite, and
to provide a more familiar environment to Class::DBI converts. The complete
map of current metadata manipulation methods and their visibility from a
typical ResultClass can be seen at the end of commit message 28ef946.

The downside was that to an outsider it would seem only natural that if in
order to make something metadata-related happen, one normally calls:


then it makes sense that one should be able to override it via:

  sub SomeResultClass::set_primary_key {
    my $ret = shift->next::method(@_);
    { do extra stuff }

That thinking has been applied to pretty much all straight-pass-through
getters in the wild, with the expectation that DBIC will respect them
throughout, like e.g. [7]. In reality this never happened - half of DBIC
would never even look at the Result class and instead simply called the
needed method on the result source instance directly. As noted in 28ef946:
the overwhelmingly common practice is to hook a method in a Result class and
to "hope for the best". A rare example of "doing it right" would be
DBIx::Class::ResultSource::MultipleTableInheritance [8], but as can be seen
from its SYNOPSIS the API is rather counterintuitive ( what is table_class()
anyway?! ) and more importantly - the earlier example seems "just right".

Another innovation (remember: pre-Moose) was the use of the just-in-time
implemented [9] alternative C3 method resolution order (MRO)[10] right on top
of the default perl DFS MRO. While DBIC used multiple inheritance (MI) from
the start, with all the corresponding problems [11][12][13] and non-scalable
"solutions" [14], it wasn't until C3 MRO became available that the true
potential of the resulting plugin system became clear. To this day (mid-2016)
MI, as used within the DBIC ecosystem, remains the single most flexible (and
thus superior given the problem domain) plugin-system on CPAN, easily
surpassing rigid delegation, and having an upper hand on role-based solutions
as promoted by the Moo(se) ecosystem. It must be noted that delegation and/or
roles are not without uses - they are an excellent (and frankly should be a
default) choice for many application-level systems. It is the mid-level to
low-level libraries like DBIC, where the stateless nature of a predictable
yet non-coordinated call-order resolution truly begins to shine.


Things stayed undisturbed for a while, until around 2012~2013 folks started
showing up with more and more complaints which all traced to Moo(se)-based
subclassing. Originally the C3 MRO composition worked just fine, because
almost invariably a ->load_components() call (which explicitly switches the
callER MRO) would have happened early enough in the life of any end-user
Result/ResultSource class. But when extends()/with() got more prominent this
was lost. The more complex the inheritance chain - the more likely that the
topmost leaf class is in fact stuck under DFS mro with everything going
sideways from there. Sometimes with truly mindbending failure cases as [15].
There was no clear solution at the time, and aside from some toothless
documentation warnings [16] nothing was done to address this (in fact even
the doc-patch itself is incomplete as noted in [17]). 

The inconsistencies, and the resulting mistakes, however, were all localized,
and even though the problems were often major, each instance was sufficiently
different (and bizarre) that each individual deployment could neither report
them properly, nor find the time to reason through the layers of history in
order to arrive at a solution they fully understand. Yet the original design
which solidified towards the end of 2007 was *just* good enough to keep being
kicked down the road.

But people kept writing more and more MOP-inspired stuff. Given the general
tendency of perl code to get "all over the place", the desire was only
natural to standardize on "one true way" of doing OO throughout an entire
end-user project/app.  And there were more and more ways in the wild to
combine/abstract individual Result classes and ResultSet components. The
comprehensive DBIx::Class::Helpers [18] are just the tip of the heap of
all possible permutations DBIC is exposed to. Towards mid-2015 it became
utterly untenable to brush off problems with "meh, just don't do that and all
will be be fine".

On the personal front I first ran into the baroque jenga tower head-on when
I tried to make sense of the ResultSource subsystem in an airport lounge
pre-YAPC::EU 2011 (Riga). I honestly do not remember *why* I started digging
in this direction but the result of that attempt (and the later effort to
revive it) got immortalized in my local tree [19]. Enough said.

Next was the dash to implement sane relationship resolution semantics in
03f6d1f, and then in 350e8d5 (which was actually needed to allow for
d0cefd9 to take place... sigh). During that journey 4006691 made a subtle
but fatal in the long run change - it upset the balance of which source
instance object we looked at during *some* (but not all) codepaths. The
really sad part is that I had the feeling that something is not right, and
even made a record of it as the last paragraph of 350e8d5. But light
testing did not reveal anything, and I irresponsibly shipped everything
as-is a bit later. It wasn't until Oct 2015 that someone noticed this being
an actual problem [20]. Early attempts to fix it quickly demonstrated just
how deep the rabbit hole goes, and were the main reason the entirety of
this work was undertaken: the accumulated debt simply did not leave any room
for a half-way solution :/


The writeup below describes only the final set of commits: it does not cover
driving into and backing out of at least 3 dead-ends, nor does it cover the
5 distinct rewrites and re-shuffles of the entire stack as more and more
involved testing revealed more and more involved failure modes. I must stress
that if you plan to undertake a similar crusade against another projects
architectural debt you are in for a rough (but *not* impossible!) ride. The
height of the "tenacity-bar" necessary to pull off such work is not reflected
in any way within the seemingly effortless walkthrough that follows. It is
also worth acknowledging that the code at times is incredibly terse and hard
to follow: this was a deliberate choice as the extra diagnostic sites that
are enabled during runtime had to be implemented as "close to the VM", so to
speak, as possible. In isolation none of the contortions are warranted, but
because I ended up with so many of them the result does pay off. See comments
within individual commit messages for various performance impacts for more

As first order of business some mechanism was needed to track the logical
relationship between the 3 levels of ResultSource instances as shown earlier
in this writeup. Luckily, the user-unfriendly nature of the metadata stack
meant there are very few spots on CPAN (and to the best of my knowledge
on DarkPAN) that do anything exotic with the subsystem. This means the
simplest thing would in fact work and was implemented as 534aff6: corral
all instantiations of ResultSource objects (and Schema objects while we are
at it) [21]. This code ensured that nothing in the stack will create an
instance of either class-type without our knowledge. With that in place, we
also provide an explicit clone method [22] encouraging folks to use that
whenever possible. The switch of all relevant callsites within DBIC itself
was verified through another check within new [23], guarded by the same
compile-time assertion constant (which in turn was provided by both the CI
and the local smoke-script from 5b87fc0)

With the above in place, ensuring 99.99% of the ResultSource "derivative"
instances were obtained via $rsrc->clone, it was time for 0ff3368. A simple
private registry hash with object addresses as keys and this hash as values:

  derivatives => {
    addr_derived_rsrc_1 => $reference_to_infohash_of_derived_rsrc_1,
    addr_derived_rsrc_2 => $reference_to_infohash_of_derived_rsrc_2,
  weakref => $weak_reference_of_self,

As necessary for any structure holding addresses of object references, a
CLONE "renumbering" routine takes care of keeping everything in sync on
iThread spawns (if you believe that iThreads are evil and one shouldn't go
through the trouble: be reminded that any call of fork() within a Win32 perl
is effectively an iThread, and fork() can and *is* being called by some CPAN
modules [24] implicitly).

Now that we had a good handle on "what came from where", the first major
diagnostic milestone 73f54e2 could be covered. As can be seen in the table
of methods in commit 28ef946 there are only a handful of attributes on an
actual ResultSource class. A couple new Class::Accessor::Grouped method types
were added, which would behave just like the 'simple' and 'component_class'
they were replacing, but with a twist:

 - any setter-based change would record its callsite in any derivative that
   was being tracked by 0ff3368, effectively marking that derivative stale
 - any getter call would consult its own entry in the metadata instance
   "stale log", and complain that things have moved on based on the callsite
   the setter left earlier

The result is the exact warning as described in commit message 73f54e2. Of
course there are some extra considerations - some high-level setters (e.g.
remove_columns) do call a getter underneath to do their job. These cases had
to be short-circuited by using a local()-based "setter callstack" mark. But
in general the changeset has been surprisingly non-invasive: once the proper
hook points were identified the rest was a breeze. There was also a brief
scratching of heads when the last stages of DarkPAN tests emitted errors
which I myself could not explain for a while, until the reason (and trivial
solution) were identified in d56e05c and [25].

As a brief detour, I considered switching ResultSource to a proper Moo class,
but quickly abandoned this idea as there are no provision for clean get-time
triggers. Nevertheless the attempt was a useful demonstration what does it
take to switch a low-level class (which means many somewhat questionable uses
by consumers in the wild) to Moo(se) with zero loss of functionality. The
result is preserved for posterity as 8ae83f0e [26].

While working on the above and f064a2a (the solution to RT#107462 [20]), it
occurred to me that the confusion of having both result_source_instance()
and result_source() can be reduced further by forcing all "getter" calls to
go through result_source() which is defined in and is thus always
available. The result was the improved diagnostic as described in the commit
message of e570488, but also a useful set of assertions that were used to
weed out many of the wrinkles [27].

The next major step was to resolve once and for all the fallout from
incorrect inheritance composition. The highly dynamic nature of all Perl's
programs, an "eternal compile/execute/compile/execute... cycle", meant that
just "fixing things" as DBIC sees them would not work - calling set_mro()
could do little when called late enough. This led to the revert of the
originally-promising "forced c3-fication" of the stack 7648acb. Instead
the practical design turned out to be "let the user know and carry on".

The first part of getting there was to devise a way to precisely and very
quickly tell "what does a class look like right now?" I have been brooding
over how to do this since mid-February, but it wasn't until I noticed
the excellent App::Isa::Splain [28] by @kentfredric, that the final interface
came into focus: 296248c (with several minor fixups later on). Here I want
to take a moment to apologize to @kentfredric, as he was led on a several
week long wild-goose chase due to a misguided comment of mine [29] :(

Amusingly while implementing this I hit a wall related to perl 5.8 (for the
first time in 6+ years): As stated in the timings at the end of commit
message 296248c and as elaborated in [30] - the non-core MRO is just too
expensive to work with. This resulted in a 1.5 week long detour to try to
squeeze every last ounce of performance. Amusingly I ran into a lot of
"interesting" stuff along the way [31][32][33] The result was not only a
semi-usable 5.8 implementation, but even running on 5.10+ was sped up about
2 times in the end, which translated into tangible gains in the end: the
number cited as 16% in 12e7015 was originally 28%(!). The moral of this
story? - gerontoperlia [34] makes your modern foundation code better. 

With a reliable way to tell what each methods "variant stack" looks like, it
was trivial to implement the 'valid_c3_composition' part of ::SanityChecker -
one would simply check a class' MRO, and in case of 'dfs' compare all stacks
to what they would look like if the MRO were 'c3' [35].

In parallel but unrelated to the above the ever increasing tightening of
various DBIC internal callpaths ( e505369, d99f2db, 3b02022 ) had to be
addressed in some way. The urgency truly "hit home" when testing revealed
RT#114440 [2] - it was nothing short of a miracle this code survived that
long without being utterly broken by other components. The solution came out
of crossing the work on describe_class_methods (296248c) with the concept
of the fail_on_internal_call guard (77c3a5d). We already have a list of
method "shadowing stacks" (to borrow @kentfredric's terminology) - if we find
a way to annotate methods in a way that we can tell when a "non-overrideable"
method was in fact overridden - we will be able to report this to the user.

The somewhat fallen out of favor subsystem of function attributes was chosen
to carry out the "annotation" task. It must be noted that this is one of the
few uses of attributes on CPAN that is architecturally consistent with how
attributes were originally implemented. An attribute is meant to attach to
a specific reference ( in our case a code reference ), instead of a name.
This is also why the FETCH/MODIFY_type_ATTRIBUTE API operates strictly with
references. As an illustration why tracking attributes by name is fraught
with peril consider the following:

perl -e '
  use Data::Dumper;
  use Moose;
  use MooseX::MethodAttributes;

  sub somemethod :Method_expected_to_always_returns_true { return 1 };

  around somemethod => sub { return 0 };

  warn Dumper {
    attributes => __PACKAGE__->meta->get_method("somemethod")->attributes,
    result => __PACKAGE__->somemethod

It should also be noted that as of this merge describe_class_methods lacks
a mechanism to "see" code references captured by around-type modifiers, and
by extension the "around-ed" function's attributes will not appear in the
"shadowed stack". A future modification of Class::Method::Modifiers, allowing
minimal introspection of what was done to which coderef should alleviate most
of this problem.

Once all relevant methods were tagged with a 'DBIC_method_is_indirect_sugar'
attribute in 1b822bd, it was trivial to implement the schema sanity check
no_indirect_method_overrides which simply ensures no user-provided method
"shadows" a superclass method with the 'sugar' attribute set [36].

The success of the attribute-based approach prompted a pass of annotating
all the methods DBIC generates for one reason or another: 09d8fb4. Aside
from enabling the last improvement, it also allowed to replicate a part of
the DBIx::Class::IntrospectableM2M functionality in core, without elevating
the status of the m2m sugar methods in any way (the historic labeling of
these helpers as relationships is a long standing source of confusion). See
the commit message of 09d8fb4 for a couple use-cases.

The last piece of the puzzle 28ef946 addressed the "override and hope for
the best" duality of ResultSource proxied methods as described at the start
of this writeup and at [37]. What we essentially do is add an around() [38]
for every method in ResultSource, which then checks whether it was called via
ResultSourceProxy (inherited from DBIx::Class::Core), or directly via the
ResultSource instance: i.e. MySchema::Result::Foo->proxied vs $rsrc->proxied
IFF we are called directly and there *is* an override of the same method on
the currently-used $rsrc->result_class we either follow one of the options
as given by an attribute annotation [37], or we emit a diag message so that
the user can do something about it.

That was easy wasn't it?


This work took about 50 person-days to carry out, and for obvious reasons
expanded to cover a much larger period of actual wall-time. While I am by
far not the most efficient developer that I have met, I am pretty sure that
the process of planning, designing, implementing and testing all of this
could not have been significantly accelerated. Even at the (laughable) rate
of $50/h The Perl Foundation is willing to pay for unique talent [39] this
endeavor would cost at least $20,000 USD - way beyond the scope (and aim?)
of a TPF grant. On the other hand it would be surprising if this work can
be qualified as unnecessary. I personally estimate that the savings due to
the proper diagnostics alone will "make up" for the effort within the first
month of wide deployment of these improvements. Time will tell of course, as
the stream of questions is only about to start come the first days of August.

In any case - this project is by far not the only one in dire need of such
"humane" overhaul. Moo, Catalyst, various pieces of the toolchain, and other
staples of what is known as "modern perl5" are in similar or worse shape:
a situation which can *not* be rectified simply by "writing patches" without
a concerted effort directed by a single [40] dedicated individual.

I yet again strongly urge the "powers of Perl" to reconsider their hands-off
approach to funding the consistently shrinking pool of maintainers. *PLEASE*
consider stealing (in the spirit of tradition) the proven successful model of
RubyTogether [41] before you end up losing even more maintainers like myself.

Peter "ribasushi" Rabbitson
Outgoing maintainer of a cornerstone Perl5 ecosystem project

( in the future you may be needing to see some of these )

[14] (... tell people "Be Careful!" )
[17] #49 (comment)
[29] kentnl/Devel-Isa-Explainer#1 (comment)
[32] 296248c#diff-c13797cc2e5864c4a1d6a92ba65871b6R801
[40] ( ... quality happens only if somebody has the responsibility for it, and that "somebody" can be no more than one single person )
  • Loading branch information...
2 parents 20c0d57 + 28ef946 commit 1cf609901b03af9464242860f0b870f0056538fc @ribasushi ribasushi committed Jul 28, 2016
Showing with 3,067 additions and 430 deletions.
  1. +13 −0 Changes
  2. +5 −0 examples/Schema/MyApp/
  3. +58 −16 lib/DBIx/Class/
  4. +2 −2 lib/DBIx/Class/CDBICompat/
  5. +4 −4 lib/DBIx/Class/CDBICompat/
  6. +5 −2 lib/DBIx/Class/CDBICompat/
  7. +10 −5 lib/DBIx/Class/CDBICompat/
  8. +16 −4 lib/DBIx/Class/
  9. +0 −9 lib/DBIx/Class/
  10. +5 −6 lib/DBIx/Class/
  11. +4 −9 lib/DBIx/Class/
  12. +5 −8 lib/DBIx/Class/
  13. +1 −1 lib/DBIx/Class/InflateColumn/
  14. +2 −2 lib/DBIx/Class/Manual/Cookbook.pod
  15. +187 −6 lib/DBIx/Class/
  16. +76 −13 lib/DBIx/Class/Relationship/
  17. +5 −5 lib/DBIx/Class/Relationship/
  18. +4 −4 lib/DBIx/Class/Relationship/
  19. +2 −2 lib/DBIx/Class/Relationship/
  20. +16 −10 lib/DBIx/Class/Relationship/
  21. +48 −19 lib/DBIx/Class/Relationship/
  22. +8 −1 lib/DBIx/Class/Relationship/
  23. +5 −6 lib/DBIx/Class/
  24. +6 −6 lib/DBIx/Class/
  25. +5 −6 lib/DBIx/Class/
  26. +436 −78 lib/DBIx/Class/
  27. +0 −1 lib/DBIx/Class/ResultSource/
  28. +0 −1 lib/DBIx/Class/ResultSource/
  29. +10 −10 lib/DBIx/Class/ResultSource/
  30. +6 −1 lib/DBIx/Class/
  31. +301 −21 lib/DBIx/Class/
  32. +55 −21 lib/DBIx/Class/ResultSourceProxy/
  33. +34 −32 lib/DBIx/Class/
  34. +249 −57 lib/DBIx/Class/
  35. +595 −0 lib/DBIx/Class/Schema/
  36. +14 −0 lib/DBIx/Class/Schema/
  37. +1 −1 lib/DBIx/Class/
  38. +11 −1 lib/DBIx/Class/Storage/
  39. +2 −1 lib/DBIx/Class/Storage/DBI/Oracle/
  40. +22 −7 lib/DBIx/Class/Storage/DBI/Sybase/
  41. +1 −1 lib/DBIx/Class/
  42. +102 −5 lib/DBIx/Class/
  43. +5 −1 lib/SQL/Translator/Parser/DBIx/
  44. +0 −1 t/35exception_inaction.t
  45. +6 −1 t/72pg.t
  46. +6 −1 t/73oracle.t
  47. +1 −1 t/86might_have.t
  48. +1 −1 t/99dbic_sqlt_parser.t
  49. +18 −0 t/cdbi/DeepAbstractSearch/01_search.t
  50. +17 −0 t/cdbi/testlib/DBIC/Test/
  51. +17 −0 t/cdbi/testlib/
  52. +16 −1 t/lib/
  53. +224 −2 t/lib/DBICTest/
  54. +5 −0 t/lib/DBICTest/Schema/
  55. +1 −1 t/lib/testinclude/
  56. +1 −1 t/lib/testinclude/
  57. +22 −0 t/resultsource/add_column_on_instance.t
  58. +25 −0 t/resultsource/instance_equivalence.t
  59. +61 −0 t/resultsource/rsrc_proxy_invocation.t
  60. +3 −0 t/storage/txn.t
  61. +3 −0 t/storage/txn_scope_guard.t
  62. +2 −0 t/zzzzzzz_perl_perf_bug.t
  63. +14 −3 xt/dist/pod_coverage.t
  64. +28 −32 xt/extra/c3_mro.t
  65. +97 −0 xt/extra/diagnostics/divergent_metadata.t
  66. +26 −0 xt/extra/diagnostics/incomplete_reregister.t
  67. +48 −0 xt/extra/diagnostics/invalid_component_composition.t
  68. +3 −0 xt/extra/internals/ithread_stress.t
  69. +82 −0 xt/extra/internals/rsrc_ancestry.t
  70. +4 −0 xt/extra/lean_startup.t
@@ -10,12 +10,19 @@ Revision history for DBIx::Class
the maintainer believe this is safe, but this is a very complex
area and reality may turn out to be different. If **ANYHTING** at
all seems out of place, please file a report at once
+ - The unique constraint info (including the primary key columns) is no
+ longer shared between related (class and schema-level) ResultSource
+ instances. If your app stops working with no obvious pointers, set
- Neither exception_action() nor $SIG{__DIE__} handlers are invoked
on recoverable errors. This ensures that the retry logic is fully
insulated from changes in control flow, as the handlers are only
invoked when an error is leaving the DBIC internals to be handled by
the caller (n.b.
(also fixes the previously rejected RT#63874)
+ - Overrides of ResultSourceProxy-provided methods are no longer skipped
+ silently: a one-per-callsite warning is issued any time this tricky
+ situation is encoutered
- $result->related_resultset() no longer passes extra arguments to
an underlying search_rs(), as by design these arguments would be
used only on the first call to ->related_resultset(), and ignored
@@ -29,6 +36,10 @@ Revision history for DBIx::Class
instead of silently discarding the argument
* New Features
+ - DBIC now performs a range of sanity checks on the entire hierarchy
+ of Schema/Result/ResultSet classes loudly alerting the end user to
+ potential extremely hard-to-diagnose pitfalls ( RT#93976, also fully
+ addresses )
- InflateColumn::DateTime now accepts the ecosystem-standard option
'time_zone', in addition to the DBIC-only 'timezone' (GH#28)
- Massively optimised literal SQL snippet scanner - fixes all known
@@ -39,6 +50,8 @@ Revision history for DBIx::Class
specific DateTime::Format dependencies
* Fixes
+ - Fix regresion (0.082800) of certain calls being presented stale
+ result source metadata (RT#107462)
- Fix incorrect SQL generated with invalid {rows} on complex resultset
operations, generally more robust handling of rows/offset attrs
- Fix incorrect $storage state on unexpected RDBMS disconnects and
@@ -6,4 +6,9 @@ use strict;
use base qw/DBIx::Class::Schema/;
+# no point taxing 5.8, but otherwise leave the default: a user may
+# be interested in exploring and seeing what broke
+ if DBIx::Class::_ENV_::OLD_MRO;
@@ -4,18 +4,17 @@ use strict;
use warnings;
use base qw( DBIx::Class::MethodAttributes Class::Accessor::Grouped );
-use mro 'c3';
-use Scalar::Util qw/weaken blessed/;
+use Scalar::Util 'blessed';
use DBIx::Class::_Util 'fail_on_internal_call';
use namespace::clean;
-sub mk_classdata {
+sub mk_classdata :DBIC_method_is_indirect_sugar {
DBIx::Class::_ENV_::ASSERT_NO_INTERNAL_INDIRECT_CALLS and fail_on_internal_call;
-sub mk_classaccessor {
+sub mk_classaccessor :DBIC_method_is_indirect_sugar {
my $self = shift;
$self->mk_group_accessors('inherited', $_[0]);
(@_ > 1)
@@ -24,24 +23,67 @@ sub mk_classaccessor {
-my $successfully_loaded_components;
+sub mk_group_accessors {
+ my $class = shift;
+ my $type = shift;
+ $class->next::method($type, @_);
+ # label things
+ if( $type =~ /^ ( inflated_ | filtered_ )? column $/x ) {
+ $class = ref $class
+ if length ref $class;
+ for my $acc_pair (
+ map
+ { [ $_, "_${_}_accessor" ] }
+ map
+ { ref $_ ? $_->[0] : $_ }
+ @_
+ ) {
+ for my $i (0, 1) {
+ my $acc_name = $acc_pair->[$i];
+ attributes->import(
+ $class,
+ (
+ $class->can($acc_name)
+ ||
+ Carp::confess("Accessor '$acc_name' we just created on $class can't be found...?")
+ ),
+ 'DBIC_method_is_generated_from_resultsource_metadata',
+ ($i
+ ? "DBIC_method_is_${type}_extra_accessor"
+ : "DBIC_method_is_${type}_accessor"
+ ),
+ )
+ }
+ }
+ }
sub get_component_class {
my $class = $_[0]->get_inherited($_[1]);
- # It's already an object, just go for it.
- return $class if blessed $class;
- if (defined $class and ! $successfully_loaded_components->{$class} ) {
+ no strict 'refs';
+ if (
+ defined $class
+ and
+ # inherited CAG can't be set to undef effectively, so people may use ''
+ length $class
+ and
+ # It's already an object, just go for it.
+ ! defined blessed $class
+ and
+ ! ${"${class}::__LOADED__BY__DBIC__CAG__COMPONENT_CLASS__"}
+ ) {
- mro::set_mro( $class, 'c3' );
- no strict 'refs';
- $successfully_loaded_components->{$class}
- = ${"${class}::__LOADED__BY__DBIC__CAG__COMPONENT_CLASS__"}
- = do { \(my $anon = 'loaded') };
- weaken($successfully_loaded_components->{$class});
+ ${"${class}::__LOADED__BY__DBIC__CAG__COMPONENT_CLASS__"}
+ = do { \(my $anon = 'loaded') };
@@ -11,9 +11,9 @@ sub _register_column_group {
return $class->next::method($group => map lc, @cols);
-sub add_columns {
+sub add_columns :DBIC_method_is_bypassable_resultsource_proxy {
my ($class, @cols) = @_;
- return $class->result_source_instance->add_columns(map lc, @cols);
+ return $class->result_source->add_columns(map lc, @cols);
sub has_a {
@@ -12,7 +12,7 @@ use namespace::clean;
__PACKAGE__->mk_classdata('_column_groups' => { });
-sub columns {
+sub columns :DBIC_method_is_bypassable_resultsource_proxy {
my $proto = shift;
my $class = ref $proto || $proto;
my $group = shift || "All";
@@ -34,9 +34,9 @@ sub _add_column_group {
$class->_register_column_group($group => @cols);
-sub add_columns {
+sub add_columns :DBIC_method_is_bypassable_resultsource_proxy {
my ($class, @cols) = @_;
- $class->result_source_instance->add_columns(@cols);
+ $class->result_source->add_columns(@cols);
sub _register_column_group {
@@ -148,7 +148,7 @@ sub _mk_group_accessors {
-sub all_columns { return shift->result_source_instance->columns; }
+sub all_columns { return shift->result_source->columns; }
sub primary_column {
my ($class) = @_;
@@ -52,9 +52,12 @@ sub sth_to_objects {
- my @ret;
+ my (@ret, $rsrc);
while (my $row = $sth->fetchrow_hashref) {
- push(@ret, $class->inflate_result($class->result_source_instance, $row));
+ push(@ret, $class->inflate_result(
+ ( $rsrc ||= $class->result_source ),
+ $row
+ ));
return @ret;
@@ -66,7 +66,7 @@ sub _declare_has_a {
else {
$self->belongs_to($col, $f_class);
- $rel_info = $self->result_source_instance->relationship_info($col);
+ $rel_info = $self->result_source->relationship_info($col);
$rel_info->{args} = \%args;
@@ -110,14 +110,14 @@ sub has_many {
if( !$f_key and !@f_method ) {
- my $f_source = $f_class->result_source_instance;
+ my $f_source = $f_class->result_source;
($f_key) = grep { $f_source->relationship_info($_)->{class} eq $class }
$class->next::method($rel, $f_class, $f_key, $args);
- my $rel_info = $class->result_source_instance->relationship_info($rel);
+ my $rel_info = $class->result_source->relationship_info($rel);
$args->{mapping} = \@f_method;
$args->{foreign_key} = $f_key;
$rel_info->{args} = $args;
@@ -128,7 +128,12 @@ sub has_many {
if (@f_method) {
- quote_sub "${class}::${rel}", sprintf( <<'EOC', perlstring $rel), { '$rf' => \sub { my $o = shift; $o = $o->$_ for @f_method; $o } };
+ my @qsub_args = (
+ { '$rf' => \sub { my $o = shift; $o = $o->$_ for @f_method; $o } },
+ { attributes => [ 'DBIC_method_is_generated_from_resultsource_metadata' ] },
+ );
+ quote_sub "${class}::${rel}", sprintf( <<'EOC', perlstring $rel), @qsub_args;
my $rs = shift->related_resultset(%s)->search_rs( @_);
$rs->{attrs}{record_filter} = $rf;
return (wantarray ? $rs->all : $rs);
@@ -150,7 +155,7 @@ sub might_have {
{ proxy => \@columns });
- my $rel_info = $class->result_source_instance->relationship_info($rel);
+ my $rel_info = $class->result_source->relationship_info($rel);
$rel_info->{args}{import} = \@columns;
@@ -53,11 +53,23 @@ sub __find_caller {
my $fr_num = 1; # skip us and the calling carp*
- my (@f, $origin);
+ my (@f, $origin, $eval_src);
while (@f = CORE::caller($fr_num++)) {
- next if
- ( $f[3] eq '(eval)' or $f[3] =~ /::__ANON__$/ );
+ undef $eval_src;
+ next if (
+ $f[2] == 0
+ or
+ # there is no value reporting a sourceless eval frame
+ (
+ ( $f[3] eq '(eval)' or $f[1] =~ /^\(eval \d+\)$/ )
+ and
+ not defined ( $eval_src = (CORE::caller($fr_num))[6] )
+ )
+ or
+ $f[3] =~ /::__ANON__$/
+ );
$origin ||= (
$f[3] =~ /^ (.+) :: ([^\:]+) $/x
@@ -84,7 +96,7 @@ sub __find_caller {
my $site = @f # if empty - nothing matched - full stack
- ? "at $f[1] line $f[2]"
+ ? ( "at $f[1] line $f[2]" . ( $eval_src ? "\n === BEGIN $f[1]\n$eval_src\n === END $f[1]" : '' ) )
: Carp::longmess()
@@ -13,9 +13,6 @@ use namespace::clean;
# this warns of subtle bugs introduced by UTF8Columns hacky handling of store_column
# if and only if it is placed before something overriding store_column
-# and also enforces C3 mro on all components
-my $mro_already_set;
sub inject_base {
my $class = shift;
my ($target, @complist) = @_;
@@ -75,12 +72,6 @@ sub inject_base {
unshift @target_isa, $comp;
- # only examine from $_[2] onwards
- # C::C3::C already sets c3 on $_[1]
- mro::set_mro( $_ => 'c3' ) for grep {
- $mro_already_set->{$_} ? 0 : ( $mro_already_set->{$_} = 1 )
- } @_[1 .. $#_];
@@ -176,7 +176,7 @@ native L<DBIx::Class::ResultSet> system.
sub resultset_instance {
- $_[0]->result_source_instance->resultset
+ $_[0]->result_source->resultset
=begin hidden
@@ -194,7 +194,7 @@ __PACKAGE__->mk_classaccessor('_result_source_instance' => []);
# Yep. this is horrific. Basically what's happening here is that
# (with good reason) DBIx::Class::Schema copies the result source for
# registration. Because we have a retarded setup order forced on us we need
-# to actually make our ->result_source_instance -be- the source used, and we
+# to actually make our ->result_source -be- the source used, and we
# need to get the source name and schema into ourselves. So this makes it
# happen.
@@ -222,15 +222,14 @@ sub result_source_instance {
my($source, $result_class) = @{$class->_result_source_instance};
- return unless blessed $source;
+ return undef unless blessed $source;
if ($result_class ne $class) { # new class
# Give this new class its own source and register it.
- $source = $source->new({
- %$source,
+ $source = $source->clone(
source_name => $class,
result_class => $class
- } );
+ );
$class->_result_source_instance([$source, $class]);
@@ -9,14 +9,11 @@ use namespace::clean;
sub filter_column {
my ($self, $col, $attrs) = @_;
- my $colinfo = $self->result_source_instance->column_info($col);
+ my $colinfo = $self->result_source->columns_info([$col])->{$col};
$self->throw_exception("FilterColumn can not be used on a column with a declared InflateColumn inflator")
if defined $colinfo->{_inflate_info} and $self->isa('DBIx::Class::InflateColumn');
- $self->throw_exception("No such column $col to filter")
- unless $self->result_source_instance->has_column($col);
$self->throw_exception('filter_column expects a hashref of filter specifications')
unless ref $attrs eq 'HASH';
@@ -34,8 +31,7 @@ sub _column_from_storage {
return $value if is_literal_value($value);
- my $info = $self->result_source->column_info($col)
- or $self->throw_exception("No column info for $col");
+ my $info = $self->result_source->columns_info([$col])->{$col};
return $value unless exists $info->{_filter_info};
@@ -49,8 +45,7 @@ sub _column_to_storage {
return $value if is_literal_value($value);
- my $info = $self->result_source->column_info($col) or
- $self->throw_exception("No column info for $col");
+ my $info = $self->result_source->columns_info([$col])->{$col};
return $value unless exists $info->{_filter_info};
@@ -63,7 +58,7 @@ sub get_filtered_column {
my ($self, $col) = @_;
$self->throw_exception("$col is not a filtered column")
- unless exists $self->result_source->column_info($col)->{_filter_info};
+ unless exists $self->result_source->columns_info->{$col}{_filter_info};
return $self->{_filtered_column}{$col}
if exists $self->{_filtered_column}{$col};
Oops, something went wrong.

0 comments on commit 1cf6099

Please sign in to comment.