1 files changed, 21 insertions, 6 deletions

diff --git a/Bugzilla/DB.pm b/Bugzilla/DB.pm
index 1f9c31518..183f619a5 100644
--- a/Bugzilla/DB.pm
+++ b/Bugzilla/DB.pm
@@ -43,6 +43,8 @@ use Bugzilla::Util;
 use Bugzilla::Error;
 use Bugzilla::DB::Schema;
 
+use Bugzilla::Metrics::Mysql;
+
 use List::Util qw(max);
 use Storable qw(dclone);
 
@@ -148,6 +150,12 @@ sub _connect {
                 . " localconfig: " . $@);
 
     # instantiate the correct DB specific module
+
+    # BMO - enable instrumentation of db calls
+    if (Bugzilla->metrics_enabled) {
+        $pkg_module = 'Bugzilla::Metrics::Mysql';
+    }
+
     my $dbh = $pkg_module->new($params);
 
     return $dbh;
@@ -159,7 +167,7 @@ sub _handle_error {
     # Cut down the error string to a reasonable size
     $_[0] = substr($_[0], 0, 2000) . ' ... ' . substr($_[0], -2000)
         if length($_[0]) > 4000;
-    $_[0] = Carp::longmess($_[0]);
+    # BMO: stracktrace disabled: $_[0] = Carp::longmess($_[0]);
     return 0; # Now let DBI handle raising the error
 }
 
@@ -1383,14 +1391,19 @@ sub _bz_real_schema {
     my ($self) = @_;
     return $self->{private_real_schema} if exists $self->{private_real_schema};
 
-    my ($data, $version) = $self->selectrow_array(
-        "SELECT schema_data, version FROM bz_schema");
+    my $bz_schema;
+    unless ($bz_schema = Bugzilla->memcached->get({ key => 'bz_schema' })) {
+        $bz_schema = $self->selectrow_arrayref(
+            "SELECT schema_data, version FROM bz_schema"
+        );
+        Bugzilla->memcached->set({ key => 'bz_schema', value => $bz_schema });
+    }
 
     (die "_bz_real_schema tried to read the bz_schema table but it's empty!")
-        if !$data;
+        if !$bz_schema;
 
-    $self->{private_real_schema} = 
-        $self->_bz_schema->deserialize_abstract($data, $version);
+    $self->{private_real_schema} =
+        $self->_bz_schema->deserialize_abstract($bz_schema->[0], $bz_schema->[1]);
 
     return $self->{private_real_schema};
 }
@@ -1432,6 +1445,8 @@ sub _bz_store_real_schema {
     $sth->bind_param(1, $store_me, $self->BLOB_TYPE);
     $sth->bind_param(2, $schema_version);
     $sth->execute();
+
+    Bugzilla->memcached->clear({ key => 'bz_schema' });
 }
 
 # For bz_populate_enum_tables