Commit 628e9ccb authored by stewart@willster.(none)'s avatar stewart@willster.(none)
Browse files

BUG#21204 ndb_size.pl doesn't take extended BLOB/TEXT size into account

parent f2e583c5

ndb/tools/ndb_size.pl

+76 −31
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ if(@ARGV < 3 || $ARGV[0] eq '--usage' || $ARGV[0] eq '--help') 
    $template->param(dsn => $dsn);

}



my @releases = ({rel=>'4.1'},{rel=>'5.0'},{rel=>'5.1'},{rel=>'5.1-dd'});

my @releases = ({rel=>'4.1'},{rel=>'5.0'},{rel=>'5.1'}); #,{rel=>'5.1-dd'});

$template->param(releases => \@releases);



my $tables  = $dbh->selectall_arrayref("show tables");
@@ -81,18 +81,19 @@ sub align { 
    return @aligned;

}



foreach(@{$tables})

{

    my $table= @{$_}[0];

sub do_table {

    my $table= shift;

    my $info= shift;

    my %indexes= %{$_[0]};

    my @count= @{$_[1]};



    my @columns;

    my $info= $dbh->selectall_hashref('describe `'.$table.'`',"Field");

    my @count  = $dbh->selectrow_array('select count(*) from `'.$table.'`');

    my %columnsize; # used for index calculations



    # We now work out the DataMemory usage

    

    # sizes for   4.1, 5.0, 5.1 and 5.1-dd

    my @totalsize= (0,0,0,0);

    @totalsize= @totalsize[0..$#releases]; # limit to releases we're outputting

    my $nrvarsize= 0;



    foreach(keys %$info)
@@ -102,6 +103,7 @@ foreach(@{$tables}) 
	my $type;

	my $size;

	my $name= $_;

	my $is_varsize= 0;



	if($$info{$_}{Type} =~ /^(.*?)\((\d+)\)/)

	{
@@ -154,6 +156,7 @@ foreach(@{$tables}) 
	    $dynamic[0]=0 if !$dynamic[0];

	    $dynamic[0]+=ceil($dynamic[0]/256); # size bit

	    $nrvarsize++;

	    $is_varsize= 1;

	    $varsize[3]= ceil($dynamic[0]);

	    @realsize= ($fixed,$fixed,ceil($dynamic[0]),$fixed);

	}
@@ -161,10 +164,38 @@ foreach(@{$tables}) 
	{@realsize=($size,$size,$size,$size)}

	elsif($type =~ /text/ || $type =~ /blob/)

	{

	    @realsize=(256,256,256,256);

	    $NoOfTables[$_]{val} += 1 foreach 0..$#releases; # blob uses table

	    @realsize=(8+256,8+256,8+256,8+256);



	    my $blobhunk= 2000;

	    $blobhunk= 8000 if $type=~ /longblob/;

	    $blobhunk= 4000 if $type=~ /mediumblob/;



	    my @blobsize=$dbh->selectrow_array("select SUM(CEILING(".

					       "length(`$name`)/$blobhunk))".

					       "from `".$table."`");

	    $blobsize[0]=0 if !defined($blobsize[0]);

	    #$NoOfTables[$_]{val} += 1 foreach 0..$#releases; # blob uses table

	    do_table($table."\$BLOB_$name",

		     {'PK'=>{Type=>'int'},

		      'DIST'=>{Type=>'int'},

		      'PART'=>{Type=>'int'},

		      'DATA'=>{Type=>"binary($blobhunk)"}

		  },

		     {'PRIMARY' => {

                         'unique' => 1,

                         'comment' => '',

                         'columns' => [

                                        'PK',

				        'DIST',

				        'PART',

                                      ],

			 'type' => 'HASH'

				    }

		  },

		     \@blobsize);

	}



	@realsize= @realsize[0..$#releases];

	@realsize= align(4,@realsize);



	$totalsize[$_]+=$realsize[$_] foreach 0..$#totalsize;
@@ -175,6 +206,7 @@ foreach(@{$tables}) 
	push @columns, {

	    name=>$name,

	    type=>$type,

	    is_varsize=>$is_varsize,

	    size=>$size,

	    key=>$$info{$_}{Key},

	    datamemory=>\@realout,
@@ -188,24 +220,10 @@ foreach(@{$tables}) 
    # Firstly, we assemble some information about the indexes.

    # We use SHOW INDEX instead of using INFORMATION_SCHEMA so

    # we can still connect to pre-5.0 mysqlds.

    my %indexes;

    {

	my $sth= $dbh->prepare("show index from `".$table.'`');

	$sth->execute;

	while(my $i = $sth->fetchrow_hashref)

	{    

	    $indexes{${%$i}{Key_name}}= {

		type=>${%$i}{Index_type},

		unique=>!${%$i}{Non_unique},

		comment=>${%$i}{Comment},

	    } if !defined($indexes{${%$i}{Key_name}});



	    $indexes{${%$i}{Key_name}}{columns}[${%$i}{Seq_in_index}-1]= 

		${%$i}{Column_name};

	}

    }



    if(!defined($indexes{PRIMARY})) {

	my @usage= ({val=>8},{val=>8},{val=>8},{val=>8});

	@usage= @usage[0..$#releases];

	$indexes{PRIMARY}= {

	    type=>'BTREE',

	    unique=>1,
@@ -217,20 +235,22 @@ foreach(@{$tables}) 
	    type=>'bigint',

	    size=>8,

	    key=>'PRI',

	    datamemory=>[{val=>8},{val=>8},{val=>8},{val=>8}],

	    datamemory=>\@usage,

	};

	$columnsize{'HIDDEN_NDB_PKEY'}= [8,8,8];

    }



    my @IndexDataMemory= ({val=>0},{val=>0},{val=>0},{val=>0});

    my @RowIndexMemory= ({val=>0},{val=>0},{val=>0},{val=>0});

    @IndexDataMemory= @IndexDataMemory[0..$#releases];

    @RowIndexMemory= @RowIndexMemory[0..$#releases];



    my @indexes;

    foreach my $index (keys %indexes) {

	my $im41= 25;

	$im41+=$columnsize{$_}[0] foreach @{$indexes{$index}{columns}};

	my @im = ({val=>$im41},{val=>25},{val=>25},{val=>25});

	my @dm = ({val=>10},{val=>10},{val=>10},{val=>10});

	my @im = ({val=>$im41},{val=>25},{val=>25}); #,{val=>25});

	my @dm = ({val=>10},{val=>10},{val=>10}); #,{val=>10});

	push @indexes, {

	    name=>$index,

	    type=>$indexes{$index}{type},
@@ -244,10 +264,10 @@ foreach(@{$tables}) 


    # total size + 16 bytes overhead

    my @TotalDataMemory;

    my @RowOverhead = ({val=>16},{val=>16},{val=>16},{val=>24});

    my @RowOverhead = ({val=>16},{val=>16},{val=>16}); #,{val=>24});

    # 5.1 has ptr to varsize page, and per-varsize overhead

    my @nrvarsize_mem= ({val=>0},{val=>0},

			{val=>8},{val=>0});

			{val=>8}); #,{val=>0});

    {

	my @a= align(4,$nrvarsize*2);

	$nrvarsize_mem[2]{val}+=$a[0]+$nrvarsize*4;
@@ -275,7 +295,7 @@ foreach(@{$tables}) 
    $counts[$_]{val}= $count foreach 0..$#releases;



    my @nrvarsize_rel= ({val=>0},{val=>0},

			{val=>$nrvarsize},{val=>0});

			{val=>$nrvarsize}); #,{val=>0});



    push @table_size, {

	table=>$table,
@@ -303,6 +323,31 @@ foreach(@{$tables}) 
    $NoOfIndexes[$_]{val} += @indexes foreach 0..$#releases;

}



foreach(@{$tables})

{

    my $table= @{$_}[0];

    my $info= $dbh->selectall_hashref('describe `'.$table.'`',"Field");

    my @count  = $dbh->selectrow_array('select count(*) from `'.$table.'`');



    my %indexes;

    {

	my $sth= $dbh->prepare("show index from `".$table.'`');

	$sth->execute;

	while(my $i = $sth->fetchrow_hashref)

	{    

	    $indexes{${%$i}{Key_name}}= {

		type=>${%$i}{Index_type},

		unique=>!${%$i}{Non_unique},

		comment=>${%$i}{Comment},

	    } if !defined($indexes{${%$i}{Key_name}});



	    $indexes{${%$i}{Key_name}}{columns}[${%$i}{Seq_in_index}-1]= 

		${%$i}{Column_name};

	}

    }

    do_table($table, $info, \%indexes, \@count);

}



my @NoOfTriggers;

# for unique hash indexes

$NoOfTriggers[$_]{val} += $NoOfIndexes[$_]{val}*3 foreach 0..$#releases;

ndb/tools/ndb_size.tmpl

+2 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ td,th { border: 1px solid black } 
  <tr>

    <th>Column</th>

    <th>Type</th>

    <th>VARSIZE</th>

    <th>Size</th>

    <th>Key</th>

    <TMPL_LOOP NAME=releases>
@@ -81,6 +82,7 @@ td,th { border: 1px solid black } 
    <tr>

      <td><TMPL_VAR NAME=name></td>

      <td><TMPL_VAR NAME=type></td>

      <td><TMPL_IF NAME=is_varsize>YES<TMPL_ELSE>&nbsp;</TMPL_IF></td>

      <td><TMPL_VAR NAME=size></td>

      <td><TMPL_VAR NAME=key></td>

      <TMPL_LOOP NAME=datamemory>