X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FResultSource%2FRowParser.pm;h=c74ab9e952e31562dfac9e2260a813af1ad72bf9;hb=574dd7c9e960fd2fa6ad083454776adf3cd967e9;hp=550c9e5b3a6fcb1688593ce36b38df1cdab918ec;hpb=2d0b795a54a018d5c9cf2593cf83045962cd9b93;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/ResultSource/RowParser.pm b/lib/DBIx/Class/ResultSource/RowParser.pm index 550c9e5..c74ab9e 100644 --- a/lib/DBIx/Class/ResultSource/RowParser.pm +++ b/lib/DBIx/Class/ResultSource/RowParser.pm @@ -70,16 +70,19 @@ sub _resolve_prefetch { # data of individual to-be-row-objects. See t/resultset/rowparser_internals.t # for extensive RV examples sub _resolve_collapse { - my ($self, $as, $as_fq_idx, $rel_chain, $parent_info, $node_idx_ref) = @_; + my ($self, $args, $common_args) = @_; # for comprehensible error messages put ourselves at the head of the relationship chain - $rel_chain ||= [ $self->source_name ]; + $args->{_rel_chain} ||= [ $self->source_name ]; - # record top-level fully-qualified column index - $as_fq_idx ||= { %$as }; + # record top-level fully-qualified column index, start nodecount + $common_args ||= { + _as_fq_idx => { %{$args->{as}} }, + _node_idx => 1, # this is *deliberately* not 0-based + }; my ($my_cols, $rel_cols); - for (keys %$as) { + for (keys %{$args->{as}}) { if ($_ =~ /^ ([^\.]+) \. (.+) /x) { $rel_cols->{$1}{$2} = 1; } @@ -132,14 +135,14 @@ sub _resolve_collapse { # throw everything assumed-from-parent away and replace with the collapser of # the parent (whatever it may be) my $assumed_from_parent; - unless ($parent_info->{underdefined}) { + unless ($args->{_parent_info}{underdefined}) { $assumed_from_parent->{columns} = { map # only add to the list if we do not already select said columns { ! exists $my_cols->{$_} ? ( $_ => 1 ) : () } - values %{$parent_info->{rel_condition} || {}} + values %{$args->{_parent_info}{rel_condition} || {}} }; - $my_cols->{$_} = { via_collapse => $parent_info->{collapse_on} } + $my_cols->{$_} = { via_collapse => $args->{_parent_info}{collapse_on_idcols} } for keys %{$assumed_from_parent->{columns}}; } @@ -151,8 +154,18 @@ sub _resolve_collapse { my $collapse_map; - # try to resolve based on our columns (plus already inserted FK bridges) + # first try to reuse the parent's collapser (i.e. reuse collapser over 1:1) + # (makes for a leaner coderef later) + unless ($collapse_map->{-idcols_current_node}) { + $collapse_map->{-idcols_current_node} = $args->{_parent_info}{collapse_on_idcols} + if $args->{_parent_info}{collapser_reusable}; + } + + + # Still dont know how to collapse - try to resolve based on our columns (plus already inserted FK bridges) if ( + ! $collapse_map->{-idcols_current_node} + and $my_cols and my $idset = $self->_identifying_column_set ({map { $_ => $my_cols->{$_}{colinfo} } keys %$my_cols}) @@ -161,38 +174,38 @@ sub _resolve_collapse { # and fix stuff up if this is the case my @reduced_set = grep { ! $assumed_from_parent->{columns}{$_} } @$idset; - $collapse_map->{-node_id} = __unique_numlist( - (@reduced_set != @$idset) ? @{$parent_info->{collapse_on}} : (), + $collapse_map->{-idcols_current_node} = [ __unique_numlist( + @{ $args->{_parent_info}{collapse_on_idcols}||[] }, + (map { my $fqc = join ('.', - @{$rel_chain}[1 .. $#$rel_chain], + @{$args->{_rel_chain}}[1 .. $#{$args->{_rel_chain}}], ( $my_cols->{$_}{via_fk} || $_ ), ); - $as_fq_idx->{$fqc}; + $common_args->{_as_fq_idx}->{$fqc}; } @reduced_set ), - ); + )]; } # Stil don't know how to collapse - keep descending down 1:1 chains - if # a related non-LEFT 1:1 is resolvable - its condition will collapse us # too - unless ($collapse_map->{-node_id}) { + unless ($collapse_map->{-idcols_current_node}) { my @candidates; for my $rel (keys %$relinfo) { next unless ($relinfo->{$rel}{is_single} && $relinfo->{$rel}{is_inner}); - if ( my $rel_collapse = $relinfo->{$rel}{rsrc}->_resolve_collapse ( - $rel_cols->{$rel}, - $as_fq_idx, - [ @$rel_chain, $rel ], - { underdefined => 1 } - )) { - push @candidates, $rel_collapse->{-node_id}; + if ( my $rel_collapse = $relinfo->{$rel}{rsrc}->_resolve_collapse ({ + as => $rel_cols->{$rel}, + _rel_chain => [ @{$args->{_rel_chain}}, $rel ], + _parent_info => { underdefined => 1 }, + }, $common_args)) { + push @candidates, $rel_collapse->{-idcols_current_node}; } } @@ -200,30 +213,23 @@ sub _resolve_collapse { # FIXME - maybe need to implement a data type order as well (i.e. prefer several ints # to a single varchar) if (@candidates) { - ($collapse_map->{-node_id}) = sort { scalar @$a <=> scalar @$b } (@candidates); + ($collapse_map->{-idcols_current_node}) = sort { scalar @$a <=> scalar @$b } (@candidates); } } - # Still dont know how to collapse - see if the parent passed us anything - # (i.e. reuse collapser over 1:1) - unless ($collapse_map->{-node_id}) { - $collapse_map->{-node_id} = $parent_info->{collapse_on} - if $parent_info->{collapser_reusable}; - } - # stop descending into children if we were called by a parent for first-pass # and don't despair if nothing was found (there may be other parallel branches # to dive into) - if ($parent_info->{underdefined}) { - return $collapse_map->{-node_id} ? $collapse_map : undef + if ($args->{_parent_info}{underdefined}) { + return $collapse_map->{-idcols_current_node} ? $collapse_map : undef } # nothing down the chain resolved - can't calculate a collapse-map - elsif (! $collapse_map->{-node_id}) { + elsif (! $collapse_map->{-idcols_current_node}) { $self->throw_exception ( sprintf "Unable to calculate a definitive collapse column set for %s%s: fetch more unique non-nullable columns", $self->source_name, - @$rel_chain > 1 - ? sprintf (' (last member of the %s chain)', join ' -> ', @$rel_chain ) + @{$args->{_rel_chain}} > 1 + ? sprintf (' (last member of the %s chain)', join ' -> ', @{$args->{_rel_chain}} ) : '' , ); @@ -232,21 +238,19 @@ sub _resolve_collapse { # If we got that far - we are collapsable - GREAT! Now go down all children # a second time, and fill in the rest - $collapse_map->{-is_optional} = 1 if $parent_info->{is_optional}; - $collapse_map->{-node_index} = ${ $node_idx_ref ||= \do { my $x = 1 } }++; # this is *deliberately* not 0-based - - my (@id_sets, $multis_in_chain); - for my $rel (sort keys %$relinfo) { - - $collapse_map->{$rel} = $relinfo->{$rel}{rsrc}->_resolve_collapse ( - { map { $_ => 1 } ( keys %{$rel_cols->{$rel}} ) }, + $collapse_map->{-is_optional} = 1 if $args->{_parent_info}{is_optional}; + $collapse_map->{-node_index} = $common_args->{_node_idx}++; - $as_fq_idx, - [ @$rel_chain, $rel], + my @id_sets; + for my $rel (sort keys %$relinfo) { - { - collapse_on => [ @{$collapse_map->{-node_id}} ], + $collapse_map->{$rel} = $relinfo->{$rel}{rsrc}->_resolve_collapse ({ + as => { map { $_ => 1 } ( keys %{$rel_cols->{$rel}} ) }, + _rel_chain => [ @{$args->{_rel_chain}}, $rel], + _parent_info => { + # shallow copy + collapse_on_idcols => [ @{$collapse_map->{-idcols_current_node}} ], rel_condition => $relinfo->{$rel}{fk_map}, @@ -256,16 +260,23 @@ sub _resolve_collapse { # (regardless of left or not) collapser_reusable => $relinfo->{$rel}{is_single}, }, - - $node_idx_ref, - ); + }, $common_args ); $collapse_map->{$rel}{-is_single} = 1 if $relinfo->{$rel}{is_single}; $collapse_map->{$rel}{-is_optional} ||= 1 unless $relinfo->{$rel}{is_inner}; - push @id_sets, @{ $collapse_map->{$rel}{-branch_id} }; + push @id_sets, ( map { @$_ } ( + $collapse_map->{$rel}{-idcols_current_node}, + $collapse_map->{$rel}{-idcols_extra_from_children} || (), + )); } - $collapse_map->{-branch_id} = __unique_numlist( @id_sets, @{$collapse_map->{-node_id}} ); + if (@id_sets) { + my $cur_nodeid_hash = { map { $_ => 1 } @{$collapse_map->{-idcols_current_node}} }; + $collapse_map->{-idcols_extra_from_children} = [ grep + { ! $cur_nodeid_hash->{$_} } + __unique_numlist( @id_sets ) + ]; + } return $collapse_map; } @@ -326,8 +337,7 @@ sub _mk_row_parser { # the collapsing parser is more complicated - it needs to keep a lot of state # else { - - my $collapse_map = $self->_resolve_collapse ( + my $collapse_map = $self->_resolve_collapse ({ # FIXME # only consider real columns (not functions) during collapse resolution # this check shouldn't really be here, as fucktards are not supposed to @@ -336,25 +346,28 @@ sub _mk_row_parser { # FIXME !!!! - this does not yet deal with unbalanced selectors correctly # (it is now trivial as the attrs specify where things go out of sync # needs MOAR tests) - { map + as => { map { ref $args->{selection}[$inflate_index->{$_}] ? () : ( $_ => $inflate_index->{$_} ) } keys %$inflate_index } - ); + }); - my $top_branch_idx_list = join (', ', @{$collapse_map->{-branch_id}}); + my $all_idcols_as_list = join ', ', sort map { @$_ } ( + $collapse_map->{-idcols_current_node}, + $collapse_map->{-idcols_extra_from_children} || (), + ); my $top_node_id_path = join ('', map { "{'\xFF__IDVALPOS__${_}__\xFF'}" } - @{$collapse_map->{-node_id}} + @{$collapse_map->{-idcols_current_node}} ); my $rel_assemblers = __visit_infmap_collapse ( $inflate_index, $collapse_map ); - $parser_src = sprintf (<<'EOS', $top_branch_idx_list, $top_node_id_path, $rel_assemblers); -### BEGIN STRING EVAL + $parser_src = sprintf (<<'EOS', $all_idcols_as_list, $top_node_id_path, $rel_assemblers); +### BEGIN LITERAL STRING EVAL my ($rows_pos, $result_pos, $cur_row, @cur_row_ids, @collapse_idx, $is_new_res) = (0,0); @@ -370,8 +383,10 @@ sub _mk_row_parser { ($_[1] and $_[1]->()) ) { + # due to left joins some of the ids may be NULL/undef, and + # won't play well when used as hash lookups $cur_row_ids[$_] = defined $cur_row->[$_] ? $cur_row->[$_] : "\xFF\xFFN\xFFU\xFFL\xFFL\xFF\xFF" - for (%1$s); # the top branch_id includes all id values + for (%1$s); $is_new_res = ! $collapse_idx[1]%2$s and ( $_[1] and $result_pos and (unshift @{$_[2]}, $cur_row) and last @@ -384,7 +399,7 @@ sub _mk_row_parser { } splice @{$_[0]}, $result_pos; # truncate the passed in array for cases of collapsing ->all() -### END STRING EVAL +### END LITERAL STRING EVAL EOS # !!! note - different var than the one above @@ -466,7 +481,7 @@ sub __visit_infmap_collapse { my $sequenced_node_id = join ('', map { "{'\xFF__IDVALPOS__${_}__\xFF'}" } - @{$collapse_map->{-node_id}} + @{$collapse_map->{-idcols_current_node}} ); my $me_struct = keys %$my_cols @@ -505,12 +520,13 @@ sub __visit_infmap_collapse { # DISABLEPRUNE #my $known_defined = { %{ $parent_info->{known_defined} || {} } }; - #$known_defined->{$_}++ for @{$collapse_map->{-node_id}}; + #$known_defined->{$_}++ for @{$collapse_map->{-idcols_current_node}}; for my $rel (sort keys %$rel_cols) { - push @src, sprintf( '%s[1]{%s} ||= [];', $node_idx_ref, perlstring($rel) ) - unless $collapse_map->{$rel}{-is_single}; +# push @src, sprintf( +# '%s[1]{%s} ||= [];', $node_idx_ref, perlstring($rel) +# ) unless $collapse_map->{$rel}{-is_single}; push @src, __visit_infmap_collapse($rel_cols->{$rel}, $collapse_map->{$rel}, { node_idx => $collapse_map->{-node_index}, @@ -525,7 +541,7 @@ sub __visit_infmap_collapse { # { "(! defined '\xFF__IDVALPOS__${_}__\xFF')" } # sort { $a <=> $b } grep # { ! $known_defined->{$_} } - # @{$collapse_map->{$rel}{-node_id}} + # @{$collapse_map->{$rel}{-idcols_current_node}} #) { # $src[-1] = sprintf( '(%s) or %s', # join (' || ', @null_checks ), @@ -539,7 +555,7 @@ sub __visit_infmap_collapse { # adding a dep on MoreUtils *just* for this is retarded sub __unique_numlist { - [ sort { $a <=> $b } keys %{ {map { $_ => 1 } @_ }} ] + sort { $a <=> $b } keys %{ {map { $_ => 1 } @_ }} } # This error must be thrown from two distinct codepaths, joining them is