Cross your fingers that this makes the million and a half dependant things happy. Changed the output of getNodeAttributes to merge the data from its different groups and to clone entries from one group for each entry in a folowing group with data in it.
I'm just gonna paste the description Jarrod sent to the group via email:
So if getAttribs ever returns more than one result, then getNodeAttribs will have it's output multiplied by that factor. I'll draw out a table with changes Chris started adding while he was also trying to flatten the recursion. Let's say 'n1' is in groups 'g1,g2,g3', and that we request columns 'c1,c2,c3,c4' Let's also assume the primary key is not simply 'node', allowing the node column to contain duplicates (as in switch table). I don't expect anyone to actually construct something this convoluted in practice, but:
node |c1 |c2 |c3 |c4
n1 |v1 | | |
g2 | |V2+= | |
g2 | |v3 |v4 |
g3 | |v5 | |v6
g3 | |v7 |v8 |v9
First, we get n1s record:
[
{ node => 'n1', c1 => 'v1',}
]
We see that c2-c4 are still unsatisfiad, then we check g1, see there is no record, so no action takes place, then getAttribs node=>'g2' returns two records. As a result, we clone our results so far and independently populate them:
[
{ node => 'n1', c1=> 'v1', c2 => 'v2+=' },
{ node => 'n1', c1 => 'v1', c2=> 'v3', c3 => 'v4'},
]
Now, in the first record, we are still looking to fill in c3, c4, and we are also still looking at c2 to complete the '+=' operation.
In the second record, we only need c4 now, no other columns will be checked for that record.
Then we hit g3. We also get two results back (two was easier, but arbitrarily many are possible, btw). Since both records are still looking to be completed, the two become 4 records (if one of the two records were satisfied before this point, the two would have become three instead):
[
{ node => 'n1', c1=> 'v1', c2 => 'v2v5',c4=>'v6' },
{ node => 'n1', c1 => 'v1', c2=> 'v3', c3 => 'v4',c4=>'v6'},
{ node => 'n1', c1=> 'v1', c2 => 'v2v7',c3=>v8,c4=>'v9' },
{ node => 'n1', c1 => 'v1', c2=> 'v3', c3 => 'v4',c4=>'v9'},
]
And that would be what getNodesAttribs would return in this case.
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7131 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
cjhardee
parent
29b7564732
commit
5b4ba54a2d
@ -2351,6 +2351,8 @@ sub getNodeAttribs_nosub_returnany_old
|
||||
my $nextRecordAtEnd = qr/\+=NEXTRECORD$/;
|
||||
my $nextRecord = qr/\+=NEXTRECORD/;
|
||||
|
||||
#this evolved a bit and i intend to rewrite it into something a bit cleaner at some point - cjhardee
|
||||
#looks for all of the requested attributes, looking into the groups of the node if needed
|
||||
sub getNodeAttribs_nosub_returnany
|
||||
{
|
||||
my $self = shift;
|
||||
@ -2384,6 +2386,7 @@ sub getNodeAttribs_nosub_returnany
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if((keys (%attribsToDo)) == 0) { #if all of the attributes are satisfied, don't look at the groups
|
||||
return @results;
|
||||
}
|
||||
@ -2400,64 +2403,92 @@ sub getNodeAttribs_nosub_returnany
|
||||
my $group;
|
||||
my @groupResults;
|
||||
my $groupResult;
|
||||
my $wasAdded; #used to keep track
|
||||
my %attribsDone;
|
||||
#print "After node results, still missing ".Dumper(\%attribsToDo)."\n";
|
||||
#print "groups are ".Dumper(\@nodegroups);
|
||||
foreach $group (@nodegroups) {
|
||||
use Storable qw(dclone);
|
||||
my @prevResCopy = @{dclone(\@results)};
|
||||
my @expandedResults;
|
||||
@groupResults = $self->getAttribs({$nodekey => $group}, keys (%attribsToDo));
|
||||
#print "group results for $group are ".Dumper(\@groupResults)."\n";
|
||||
$data = $groupResults[0];
|
||||
if (defined($data)) { #if some attributes came back from the query for this group
|
||||
#print "group $group \n".Dumper(\@groupResults)."\n";
|
||||
|
||||
foreach $groupResult (@groupResults) {
|
||||
my %toPush;
|
||||
foreach $attrib (keys %attribsToDo) { #check each unfinished attribute against the results for this group
|
||||
#print "looking for attrib $attrib\n";
|
||||
if(defined($groupResult->{$attrib})){
|
||||
#print "found attrib $attrib\n";
|
||||
$attribsDone{$attrib} = 0;
|
||||
#print "found attArib $attrib = $groupResult->{$attrib}\n";
|
||||
#print "and results look like this: \n".Dumper(\@results)."\n\n\n";
|
||||
foreach $result (@results){ #loop through our existing results to add or modify the value for this attribute
|
||||
if(defined($result) && defined($result->{$attrib}) && $result->{$attrib} =~$nextRecordAtEnd){ #if the attribute was there and the value should be added
|
||||
$result->{$attrib} =~ s/$nextRecordAtEnd//; #pull out the existing next record string
|
||||
$result->{$attrib} .= $groupResult->{$attrib}; #add the group result onto the end of the existing value
|
||||
if($options{withattribution} && $attrib ne $nodekey) {
|
||||
if(defined($result->{'!!xcatgroupattribution!!'})) {
|
||||
if(defined($result->{'!!xcatgroupattribution!!'}->{$attrib})) {
|
||||
$result->{'!!xcatgroupattribution!!'}->{$attrib} .= "," . $group;
|
||||
if(defined($result)) {
|
||||
if(defined($result->{$attrib})) {
|
||||
if($result->{$attrib} =~$nextRecordAtEnd){ #if the attribute value should be added
|
||||
$result->{$attrib} =~ s/$nextRecordAtEnd//; #pull out the existing next record string
|
||||
$result->{$attrib} .= $groupResult->{$attrib}; #add the group result onto the end of the existing value
|
||||
if($groupResult->{$attrib} =~ $nextRecordAtEnd && defined($attribsDone{$attrib})){
|
||||
delete $attribsDone{$attrib};
|
||||
}
|
||||
else {
|
||||
$result->{'!!xcatgroupattribution!!'}->{$attrib} = $node.",".$group;
|
||||
if($options{withattribution} && $attrib ne $nodekey) {
|
||||
if(defined($result->{'!!xcatgroupattribution!!'})) {
|
||||
if(defined($result->{'!!xcatgroupattribution!!'}->{$attrib})) {
|
||||
$result->{'!!xcatgroupattribution!!'}->{$attrib} .= "," . $group;
|
||||
}
|
||||
else {
|
||||
$result->{'!!xcatgroupattribution!!'}->{$attrib} = $node.",".$group;
|
||||
}
|
||||
}
|
||||
else {
|
||||
$result->{'!!xcatgroupattribution!!'}->{$attrib} = $node.",".$group;
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
$result->{'!!xcatgroupattribution!!'}->{$attrib} = $node.",".$group;
|
||||
}
|
||||
}
|
||||
$wasAdded = 1; #this group result was handled
|
||||
#print "attrib $attrib was joined with value $groupResult->{$attrib}\n";
|
||||
}
|
||||
}
|
||||
if(!$wasAdded){ #if there was not a value already in the results. we know there is no entry for this
|
||||
else {#attribute did not already have an entry
|
||||
#print "attrib $attrib was added with value $groupResult->{$attrib}\n";
|
||||
$toPush{$attrib} = $groupResult->{$attrib};
|
||||
if($options{withattribution} && $attrib ne $nodekey){
|
||||
$toPush{'!!xcatgroupattribution!!'}->{$attrib} = $group;
|
||||
$result->{$attrib} = $groupResult->{$attrib};
|
||||
if($options{withattribution} && $attrib ne $nodekey){
|
||||
$result->{'!!xcatgroupattribution!!'}->{$attrib} = $group;
|
||||
}
|
||||
if($groupResult->{$attrib} =~ $nextRecordAtEnd && defined($attribsDone{$attrib})){
|
||||
delete $attribsDone{$attrib};
|
||||
}
|
||||
}
|
||||
}
|
||||
else {#no results in the array so far
|
||||
#print "pushing for the first time. attr=$attrib groupResults=$groupResult->{$attrib}\n";
|
||||
$toPush{$attrib} = $groupResult->{$attrib};
|
||||
if($options{withattribution} && $attrib ne $nodekey){
|
||||
$toPush{'!!xcatgroupattribution!!'}->{$attrib} = $group;
|
||||
}
|
||||
if($groupResult->{$nodekey}) {
|
||||
$toPush{$nodekey} = $node;
|
||||
}
|
||||
if($groupResult->{$attrib} =~ $nextRecordAtEnd && defined($attribsDone{$attrib})){
|
||||
delete $attribsDone{$attrib};
|
||||
}
|
||||
}
|
||||
}
|
||||
if($groupResult->{$attrib} !~ $nextRecordAtEnd){ #the attribute was satisfied if it does not expect to add the next record
|
||||
$attribsDone{$attrib} = 0;
|
||||
}
|
||||
}
|
||||
$wasAdded = 0; #reset
|
||||
}
|
||||
if(keys(%toPush) != 0) {
|
||||
if ($groupResult->{$nodekey}) {
|
||||
$toPush{$nodekey} = $node;
|
||||
}
|
||||
if(keys(%toPush) > 0) {
|
||||
#print "pushing ".Dumper(\%toPush)."\n";
|
||||
if(!defined($results[0])) {
|
||||
shift(@results);
|
||||
}
|
||||
push(@results,\%toPush);
|
||||
}
|
||||
#print "pushing results into expanded results\n";
|
||||
#print "results= ".Dumper(\@results)."\n";
|
||||
push(@expandedResults, @results);
|
||||
#print "expandedResults= ".Dumper(\@expandedResults)."\n";
|
||||
#print "setting results to previous:\n".Dumper(\@prevResCopy)."\n\n\n";
|
||||
@results = @{dclone(\@prevResCopy)};
|
||||
}
|
||||
@results = @expandedResults;
|
||||
foreach $attrib (keys %attribsDone) {
|
||||
if(defined($attribsToDo{$attrib})) {
|
||||
delete $attribsToDo{$attrib};
|
||||
@ -2477,11 +2508,9 @@ sub getNodeAttribs_nosub_returnany
|
||||
}
|
||||
}
|
||||
|
||||
#Don't need to 'correct' node attribute, considering result of the if that governs this code block?
|
||||
return @results;
|
||||
}
|
||||
|
||||
|
||||
#--------------------------------------------------------------------------
|
||||
|
||||
=head3 getAllEntries
|
||||
|
||||
Loading…
Reference in New Issue
Block a user