arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

move updateschema from Table->new to xcatd

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7335 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
lissav 2010-09-01 14:09:38 +00:00
parent 9a45c6177c
commit d3295bc15e
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
perl-xCAT/xCAT/ExtTab.pm
View File

@ -113,7 +113,7 @@ foreach (@extSchema) {
It is called by xcatd to generate the user-defined tables
if they do not exist, it also updates the tables if there is
Schmea change.
a schema change.
=cut
@ -124,7 +124,9 @@ sub updateTables
#print "\nupdateTables\n";
#print "\n";
foreach (keys %ext_tabspec) {
my $table= xCAT::Table->new($_,-create=>1,-autocommit=>1);
my $table= xCAT::Table->new($_,-create=>1);
my $rc=$table->updateschema();
$table->close();
}
}
#--------------------------------------------------------------------------

31
perl-xCAT/xCAT/Table.pm
View File

@ -844,7 +844,6 @@ sub new
} # end Generic DBI
updateschema($self, $xcatcfg);
} #END DB ACCESS SPECIFIC SECTION
if ($self->{tabname} eq 'nodelist')
{
@ -876,11 +875,10 @@ sub new
Error:
Example:
$self->{tabname} = shift;
$self->{schema} = $xCAT::Schema::tabspec{$self->{tabname}};
$self->{colnames} = \@{$self->{schema}->{cols}};
updateschema($self);
Example: my $nodelisttab=xCAT::Table->new('nodelist');
$nodelisttab->updateschema();
$nodelisttab->close();
Comments:
none
@ -892,10 +890,12 @@ sub updateschema
#This determines alter table statements required..
my $self = shift;
my $xcatcfg = shift;
my $descr=$xCAT::Schema::tabspec{$self->{tabname}};
my $tn=$self->{tabname};
my $xcatdb2schema;
my $xcatcfg=get_xcatcfg();
my $rc=0;
my $msg;
if ($xcatcfg =~ /^DB2:/) { # for DB2 , get schema name
my @parts = split ( '\|', $xcatcfg);
$xcatdb2schema = $parts[1];
@ -1003,6 +1003,8 @@ sub updateschema
my $stmt =
"ALTER TABLE " . $self->{tabname} . " ADD $tmpcol $datatype";
$self->{dbh}->do($stmt);
$msg="updateschema: Running $stmt";
xCAT::MsgUtils->message("S", $msg);
if ($self->{dbh}->errstr) {
xCAT::MsgUtils->message("S", "Error adding columns for table " . $self->{tabname} .":" . $self->{dbh}->errstr);
if ($xcatcfg =~ /^DB2:/){ # see if table space error
@ -1016,7 +1018,7 @@ sub updateschema
}
my $tablename=$self->{tabname};
$tablename=~ tr/a-z/A-Z/; # convert to upper
my $msg="Moving table $self->{tabname} to $tablespace";
$msg="Moving table $self->{tabname} to $tablespace";
xCAT::MsgUtils->message("S", $msg);
my $stmt2="Call sysproc.admin_move_table('XCATDB',\'$tablename\',\'$tablespace\',\'$tablespace\',\'$tablespace\','','','','','','MOVE')";
$self->{dbh}->do($stmt2);
@ -1033,6 +1035,9 @@ sub updateschema
} # if db2
} # error on add column
if (!$self->{dbh}->{AutoCommit}) { # commit add column
$self->{dbh}->commit;
}
}
}
@ -1082,7 +1087,8 @@ sub updateschema
$stmt =
"ALTER TABLE " . $self->{tabname} . " MODIFY COLUMN $tmpkey $datatype";
}
xCAT::MsgUtils->message("S", $stmt);
$msg="updateschema: Running $stmt";
xCAT::MsgUtils->message("S", $msg);
#print "stmt=$stmt\n";
$self->{dbh}->do($stmt);
if ($self->{dbh}->errstr) {
@ -1099,6 +1105,8 @@ sub updateschema
"ALTER TABLE " . $self->{tabname} . " DROP PRIMARY KEY, ADD PRIMARY KEY ($tmp)";
#print "stmt=$stmt\n";
$self->{dbh}->do($stmt);
$msg="updateschema: Running $stmt";
xCAT::MsgUtils->message("S", $msg);
if ($self->{dbh}->errstr) {
xCAT::MsgUtils->message("S", "Error changing the keys for table " . $self->{tabname} .":" . $self->{dbh}->errstr);
}
@ -1123,6 +1131,8 @@ sub updateschema
if (!$self->{dbh}->{AutoCommit}) {
$self->{dbh}->commit;
}
$msg="updateschema: Running $str";
xCAT::MsgUtils->message("S", $msg);
if ($self->{dbh}->errstr) {
xCAT::MsgUtils->message("S", "Error renaming the table from $tn to $btn:" . $self->{dbh}->errstr);
}
@ -1146,6 +1156,8 @@ sub updateschema
#copy the data from backup to the table
$str = "INSERT INTO $tn SELECT * FROM $btn";
$self->{dbh}->do($str);
$msg="updateschema: Running $str";
xCAT::MsgUtils->message("S", $msg);
if ($self->{dbh}->errstr) {
xCAT::MsgUtils->message("S", "Error copying data from table $btn to $tn:" . $self->{dbh}->errstr);
} else {
@ -1160,6 +1172,7 @@ sub updateschema
}
}
return $rc;
}
#--------------------------------------------------------------------------