Changeset 1927

Timestamp:

04/16/08 15:36:30 (6 months ago)

Author:

mpaschal

Message:

Land the new implementation of metadata based on narrow tables
BugzID: 68749

Files:

• branches/release-35/build/mt-dists/default.mk (modified) (1 diff)
• branches/release-35/lib/MT.pm.pre (modified) (9 diffs)
• branches/release-35/lib/MT/Asset/Image.pm (modified) (1 diff)
• branches/release-35/lib/MT/Author.pm (modified) (3 diffs)
• branches/release-35/lib/MT/Blog.pm (modified) (2 diffs)
• branches/release-35/lib/MT/Component.pm (modified) (1 diff)
• branches/release-35/lib/MT/Meta (copied) (copied from branches/feature-narrow-tables/lib/MT/Meta)
• branches/release-35/lib/MT/Meta.pm (copied) (copied from branches/feature-narrow-tables/lib/MT/Meta.pm)
• branches/release-35/lib/MT/Meta/Proxy.pm (copied) (copied from branches/feature-narrow-tables/lib/MT/Meta/Proxy.pm)
• branches/release-35/lib/MT/Object.pm (modified) (14 diffs)
• branches/release-35/lib/MT/ObjectDriver/DDL/mysql.pm (modified) (1 diff)
• branches/release-35/lib/MT/Template.pm (modified) (2 diffs)
• branches/release-35/lib/MT/Upgrade.pm (modified) (1 diff)
• branches/release-35/t/09-image.t (modified) (4 diffs)
• branches/release-35/t/20-setup.t (modified) (1 diff)
• branches/release-35/t/22-author.t (modified) (4 diffs)
• branches/release-35/t/64-objectmeta.t (modified) (2 diffs)
• branches/release-35/t/lib/MT/Test.pm (modified) (31 diffs)
• branches/release-35/t/plugins/Awesome (copied) (copied from branches/feature-narrow-tables/t/plugins/Awesome)
• branches/release-35/t/plugins/Awesome/config.yaml (copied) (copied from branches/feature-narrow-tables/t/plugins/Awesome/config.yaml)
• branches/release-35/t/plugins/Awesome/lib (copied) (copied from branches/feature-narrow-tables/t/plugins/Awesome/lib)
• branches/release-35/t/plugins/Awesome/lib/MT (copied) (copied from branches/feature-narrow-tables/t/plugins/Awesome/lib/MT)
• branches/release-35/t/plugins/Awesome/lib/MT/Awesome (copied) (copied from branches/feature-narrow-tables/t/plugins/Awesome/lib/MT/Awesome)
• branches/release-35/t/plugins/Awesome/lib/MT/Awesome.pm (copied) (copied from branches/feature-narrow-tables/t/plugins/Awesome/lib/MT/Awesome.pm)
• branches/release-35/t/plugins/Awesome/lib/MT/Awesome/Image.pm (copied) (copied from branches/feature-narrow-tables/t/plugins/Awesome/lib/MT/Awesome/Image.pm)

branches/release-35/build/mt-dists/default.mk

@@ -2 +2 @@
-
-PRODUCT_VERSION = 4.15
-4
+5
-API_VERSION = 4.15
-

branches/release-35/lib/MT.pm.pre

@@ -58 +58 @@
-            no strict 'refs';
-            unless ( defined *{ $compat . '::' } ) {
-
+# line " . __LINE__ . " " . __FILE__ . "\n
-            }
-        }
@@ -267 +267 @@
-        return $object_types{$k} if exists $object_types{$k};
-
+        if ($k =~ m/^(.+):meta$/) {
+            my $ppkg = $pkg->model($1);
+            my $mpkg = $ppkg->meta_pkg;
+            return $mpkg ? $object_types{$k} = $mpkg : undef;
+        }
+
-        my $model = $pkg->registry( 'object_types', $k );
-        if ( ref($model) eq 'ARRAY' ) {
@@ -287 +293 @@
-        unless ( defined *{ $model . '::__properties' } ) {
-            use strict 'refs';
-
+# line " . __LINE__ . " " . __FILE__ . "\n
-            if ( $@ && ( $k =~ m/^(.+)\./ ) ) {
-
@@ -612 +618 @@
-
-    $cb->error();    # reset the error string
-
+
+
+
+
-    if ( my $err = $@ ) {
-        $cb->error($err);
@@ -1262 +1271 @@
-                    $Plugins{$plugin_sig}{full_path} = $plugin_full_path;
-                    $timer->pause_partial if $timer;
-{ require $plugin }
+"# line " . __LINE__ . " " . __FILE__ . "\nrequire '$plugin';"
-                    $timer->mark("Loaded plugin " . $sig) if $timer;
-                    if ($@) {
@@ -1270 +1279 @@
-                        # the database has been initialized...
-                        eval {
+                            # line __LINE__ __FILE__
-                            require MT::Log;
-                            $mt->log(
@@ -2588 +2598 @@
-            if ($method) {
-                return sub {
-
+# line " . __LINE__ . " " . __FILE__ . "\n
-                      or Carp::confess(
-                        "failed loading package $hdlr_pkg for routine $name: $@");
@@ -2599 +2609 @@
-            else {
-                return sub {
-
+# line " . __LINE__ . " " . __FILE__ . "\n
-                      or Carp::confess(
-                        "failed loading package $hdlr_pkg for routine $name: $@");
@@ -2613 +2623 @@
-        }
-        else {
-
+# line " . __LINE__ . " " . __FILE__ . "\n
-              or Carp::confess(
-                "failed loading package $hdlr_pkg for routine $name: $@");

branches/release-35/lib/MT/Asset/Image.pm

@@ -10 +10 @@
-use base qw( MT::Asset );
-
-
-
+
+
+
+
+
+
+
-
-# List of supported file extensions (to aid the stock 'can_handle' method.)

branches/release-35/lib/MT/Author.pm

@@ -37 +37 @@
-        'userpic_asset_id' => 'integer',
-        'basename' => 'string(255)',
+
+        # meta properties
+        'widgets' => 'hash meta',
+        'favorite_blogs' => 'array meta',
-    },
-    defaults => {
@@ -59 +63 @@
-    audit => 1,
-});
-__PACKAGE__->install_meta({
-    columns => [
-        'favorite_blogs',
-        'widgets',
-    ],
-});
-
-sub class_label {
@@ -263 +261 @@
-    die unless $perms->isa('MT::Permission');
-    $perms->can_edit_all_posts ||
-
+    
-}
-

branches/release-35/lib/MT/Blog.pm

@@ -77 +77 @@
-        'archive_tmpl_category' => 'string(255)',
-        'archive_tmpl_individual' => 'string(255)',
+
+        # meta properties
+        'image_default_wrap_text' => 'integer meta',
+        'image_default_align' => 'string meta',
+        'image_default_thumb' => 'integer meta',
+        'image_default_width' => 'integer meta',
+        'image_default_wunits' => 'integer meta',
+        'image_default_constrain' => 'integer meta',
+        'image_default_popup' => 'integer meta',
+        'commenter_authenticators' => 'string meta',
+        'require_typekey_emails' => 'integer meta',
+        'nofollow_urls' => 'integer meta',
+        'follow_auth_links' => 'integer meta',
+        'update_pings' => 'integer meta',
+        'captcha_provider' => 'string meta',
+        'publish_queue' => 'integer meta',
+        'nwc_smart_replace' => 'integer meta',
+        'nwc_replace_field' => 'string meta',
+        'template_set' => 'string meta',
+        'page_layout' => 'string meta',
+        'include_system' => 'integer meta',
+        'include_cache' => 'integer meta',
-    },
-    meta => 1,
@@ -93 +115 @@
-    datasource => 'blog',
-    primary_key => 'id',
-});
-__PACKAGE__->install_meta({
-    columns => [
-        'image_default_wrap_text',
-        'image_default_align',
-        'image_default_thumb',
-        'image_default_width',
-        'image_default_wunits',
-        'image_default_constrain',
-        'image_default_popup',
-        'commenter_authenticators',
-        'require_typekey_emails',
-        'nofollow_urls',
-        'follow_auth_links',
-        'update_pings',
-        'captcha_provider',
-        'publish_queue',
-        'nwc_smart_replace',
-        'nwc_replace_field',
-        'template_set',
-        'page_layout',
-        'include_system',
-        'include_cache',
-    ],
-});
-

branches/release-35/lib/MT/Component.pm

@@ -508 +508 @@
-
-                # check for a yaml file reference...
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        }
-                    }

branches/release-35/lib/MT/Object.pm

@@ -53 +53 @@
-    }
-
+    my %meta;
+
-    my $super_props = $class->SUPER::properties();
+    $props->{meta} = 1 if $super_props && $super_props->{meta};
+
+    if ($props->{meta}) {
+        # yank out any meta columns before we start working on column_defs
+        $meta{$_} = delete $props->{column_defs}{$_}
+            for grep { $props->{column_defs}{$_} =~ m/\bmeta\b/ }
+            keys %{ $props->{column_defs} };
+    }
+
-    if ($super_props) {
-        # subclass; merge hash
-meta_column class_column datasource driver audit meta
+class_column datasource driver audit
-            $props->{$_} = $super_props->{$_}
-                if exists $super_props->{$_} && !(exists $props->{$_});
-        }
- meta_columns
+
-            if (exists $super_props->{$p}) {
-                foreach my $k (keys %{ $super_props->{$p} }) {
@@ -81 +92 @@
-    # Legacy MT::Object types only define 'columns'; we still support that
-    # but they aren't handled properly with the upgrade system as a result.
-
-
-
+
-        map { $props->{column_defs}{$_} = () } @{ $props->{columns} };
-    }
+    $props->{columns} = [ keys %{ $props->{column_defs} } ];
-
-    # Support audit flags
@@ -98 +108 @@
-    }
-
-    # Metadata column
-    $props->{meta_column} ||= 'meta' if exists $props->{meta};
-    if (my $col = $props->{meta_column}) {
-        if (!$props->{column_defs}{$col}) {
-            $props->{column_defs}{$col} = 'blob';
-            push @{ $props->{columns} }, $col;
-        }
-        no strict 'refs'; ## no critic
-        *{$class . '::' . $col} = \&__meta_column;
-        $class->add_trigger( pre_save => \&pre_save_serialize_metadata );
-    }
-
-    # Classed object types
-    $props->{class_column} ||= 'class' if exists $props->{class_type};
@@ -151 +149 @@
-        foreach my $isa_class (@classes) {
-            next if UNIVERSAL::isa($class, $isa_class);
-
+# line " . __LINE__ . " " . __FILE__ . "\n
-            no strict 'refs'; ## no critic
-            push @{$class . '::ISA'}, $isa_class;
@@ -160 +158 @@
-            for my $name (keys %$cols) {
-                next if exists $props->{column_defs}{$name};
+                if ($cols->{$name} =~ m/\bmeta\b/) {
+                    $meta{$name} = $cols->{$name};
+                    next;
+                }
+
-                $class->install_column($name, $cols->{$name});
-                $props->{indexes}{$name} = 1
@@ -226 +229 @@
-        no strict 'refs'; ## no critic
-        *{$class . '::driver'} = sub { $_[0]->dbi_driver(@_) };
+    }
+
+    # inherit parent's metadata setup
+    if ($props->{meta}) { # if ($super_props && $super_props->{meta_installed}) {
+        $class->install_meta({ ( %meta ? ( column_defs => \%meta ) : ( columns => [] ) ) });
+        $class->add_trigger( post_remove => \&remove_meta );
-    }
-
@@ -347 +356 @@
-            return $package;
-        } else {
-
+# line " . __LINE__ . " " . __FILE__ . "\n
-            return $package unless $@;
-
+# line " . __LINE__ . " " . __FILE__ . "\n
-            return $package unless $@;
-        }
@@ -373 +382 @@
-# 'meta' metadata column support
-
+sub new {
+    my $class = shift;
+    my $obj = $class->SUPER::new(@_);
+    if ($obj->properties->{meta_installed}) {
+        $obj->init_meta();
+    }
+    return $obj;
+}
+
+sub init_meta {
+    my $obj = shift;
+    require MT::Meta::Proxy;
+    $obj->{__meta} = MT::Meta::Proxy->new($obj);
+}
+
-sub install_meta {
-    my $class = shift;
-rop
+aram
-    if ( ( $class ne 'MT::Config' ) && (!$MT::plugins_installed) ) {
-rop
+aram
-        return;
-    }
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-sub has_meta {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if (@_) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-}
-
@@ -466 +602 @@
-    my $ret = sprintf '%04d-%02d-%02d %02d:%02d:%02d', unpack 'A4A2A2A2A2A2', $_[0];  
-    return $ret;  
-  
+
-  
-sub db2ts {  
@@ -754 +890 @@
-}
-
+sub clone_all {
+    my $obj = shift;
+    my $clone = $obj->SUPER::clone_all();
+    $clone->{__meta} = $obj->{__meta};  # TODO: clone this too
+    return $clone;
+}
+
-sub clone {
-    my $obj = shift;
-    my($param) = @_;
-SUPER::clone_all
+clone_all()
-
-    ## If the caller has listed a set of columns not to copy to the clone,
@@ -821 +964 @@
-}
-
+sub remove_meta {
+    my $obj = shift;
+    return 1 unless ref $obj;
+    my $mpkg = $obj->meta_pkg or return;
+    my $id_field = $obj->datasource . '_id';
+    return $mpkg->remove({ $id_field => $obj->id });
+}
+
-sub remove_children {
-    my $obj = shift;
@@ -834 +985 @@
-    my $obj_id = $obj->id;
-    for my $class (@classes) {
-
+# line " . __LINE__ . " " . __FILE__ . "\n
-        $class->remove({ $key => $obj_id });
-    }
@@ -943 +1094 @@
-    $def{key} = 1 if ($props->{primary_key}) && ($props->{primary_key} eq $col);
-    $def{auto} = 1 if $def =~ m/\bauto[_ ]increment\b/i;
-
+
+
-    \%def;
-}
@@ -1008 +1160 @@
-    $hash;
-}
+
+package MT::Object::Meta;
+
+use base qw( Data::ObjectDriver::BaseObject );
+
+sub driver { $MT::Object::DRIVER ||= MT::ObjectDriverFactory->new }
+
+sub install_properties {
+    my $class = shift;
+    my ($props) = @_;
+    $props->{column_defs}->{$_} ||= 'string'
+        for @{ $props->{columns} };
+    $class->SUPER::install_properties(@_);
+}
+
+sub meta_pkg { undef }
+
+*table_name = \&MT::Object::table_name;
+*column_defs = \&MT::Object::column_defs;
+*column_def = \&MT::Object::column_def;
+*index_defs = \&MT::Object::index_defs;
+*__parse_defs = \&MT::Object::__parse_defs;
+*__parse_def = \&MT::Object::__parse_def;
+*count = \&MT::Object::count;
+*columns_of_type = \&MT::Object::columns_of_type;
+
+# TODO: copy this too
+sub blob_requires_zip {}
-
-1;

branches/release-35/lib/MT/ObjectDriver/DDL/mysql.pm

@@ -22 +22 @@
-    my $field_prefix = $class->datasource;
-    my $table_name = $class->table_name;
+    local $dbh->{RaiseError} = 0;
-    my $sth = $dbh->prepare('SHOW INDEX FROM ' . $table_name)
-        or return undef;

branches/release-35/lib/MT/Template.pm

@@ -35 +35 @@
-        'build_type' => 'smallint',
-        'build_interval' => 'integer',
+
+        # meta properties
+        'last_rebuild_time' => 'integer meta',
+        'page_layout' => 'string meta',
+        'include_with_ssi' => 'integer meta',
+        'use_cache' => 'integer meta',
+        'cache_expire_type' => 'integer meta',
+        'cache_expire_interval' => 'integer meta',
+        'cache_expire_event' => 'string meta',
-    },
-    indexes => {
@@ -54 +63 @@
-    datasource => 'template',
-    primary_key => 'id',
-});
-__PACKAGE__->install_meta({
-    columns => [
-        'last_rebuild_time',
-        'page_layout',
-        'include_with_ssi',
-        'use_cache',
-        'cache_expire_type',
-        'cache_expire_interval',
-        'cache_expire_event',
-    ],
-});
-__PACKAGE__->add_trigger('pre_remove' => \&pre_remove_children);

branches/release-35/lib/MT/Upgrade.pm

@@ -1352 +1352 @@
-        }
-    }
+
+    # handle schema updates for meta table
+    if ($class->meta_pkg) {
+        $self->check_type($type . ':meta');
+    }
+
-    1;
-}

branches/release-35/t/09-image.t

@@ -25 +25 @@
-    );
-    @drivers = qw( ImageMagick NetPBM );
-
+
+
+
-}
-
@@ -38 +40 @@
-
-for my $rec (@Img) {
-
+
+
-    ok(-B $img_file, "$img_file looks like a binary file");
-
@@ -46 +49 @@
-SKIP : {
-        skip("no $driver image", 17) unless $img;
-
+, "driver $driver with image $img_file is an MT::Image::$driver"
-#        diag( MT::Image->errstr ) if MT::Image->errstr;
-
-$rec->[1], "width is $rec->[1]
-rec->[2], "height is $rec->[2]
-
-rec->[1], "width is $rec->[1]
-rec->[2], "height is $rec->[2]
+ $img_width,  "$driver says $img_filename is $img_width px wide
+img_height, "$driver says $img_filename is $img_height px high
+()
+img_width,  "${driver}'s get_dimensions says $img_filename is $img_width px wide
+img_height, "${driver}'s get_dimensions says $img_filename is $img_height px high
-
-        ($w, $h) = $img->get_dimensions(Scale => 50);
-
-
-
+
+
+
+
+
+
+
-
-        ($w, $h) = $img->get_dimensions(Width => 50);
-'width is 50'
+"$driver says $img_filename scaled to 50 px wide is 50 px wide"
-
-        ($w, $h) = $img->get_dimensions(Width => 50, Height => 100);
-'width is 50'
-'height is 100'
+ "$driver says $img_filename scaled to 50x100 is 50 px wide"
+"$driver says $img_filename scaled to 50x100 is 100 px high"
-
-        (my($blob), $w, $h) = $img->scale(Scale => 50);
-->{width} / 2), int($img->{height}
-width is $x
-height is $y
+_width / 2), int($img_height
+result of scaling $img_filename to 50\% with $driver is $x px wide
+result of scaling $img_filename to 50\% with $driver is $y px high
-
-        open FH, $img_file or die $!;
@@ -80 +87 @@
-        isa_ok($img, 'MT::Image::' . $driver);
-#            diag( MT::Image->errstr ) if MT::Image->errstr;
-$rec->[1], "width is $rec->[1]
-rec->[2], "height is $rec->[2]
+ $img_width,  "$driver says $img_filename from blob is $img_width px wide
+img_height, "$driver says $img_filename from blob is $img_height px high
-        ($w, $h) = $img->get_dimensions;
-rec->[1], "width is $rec->[1]
-rec->[2], "height is $rec->[2]
+img_width,  "${driver}'s get_dimensions says $img_filename from blob is $img_width px wide
+img_height, "${driver}'s get_dimensions says $img_filename from blob is $img_height px high
-} # END SKIP
-    }

branches/release-35/t/20-setup.t

@@ -39 +39 @@
-ObjectDriver DBI::sqlite
-PluginPath ../plugins
+PluginPath plugins
-CFG
-    close $fh;

branches/release-35/t/22-author.t

@@ -8 +8 @@
-use lib 'extlib';
-
-5
+6
-
-use MT;
@@ -34 +34 @@
-my $perm = $author->blog_perm(1);
-ok($perm, "$author->blog_perm(1)") || die;
-can_edit_entry(1)
-can_edit_entry(2)
+Chuck D can edit entry #1
+Chuck D can edit entry #2
-ok($perm->can_comment, 'can_comment');
-ok($perm->can_post, 'can_post');
@@ -58 +58 @@
-
-{
+diag('meta field tests');
+
+my $author = MT::Author->load({ name => 'Chuck D' });
+ok(eval { $author->widgets(); 1 }, 'Author obj has widgets accessor');
+ok(!defined $author->widgets, "Author's widgets are undefined by default");
+ok(!defined $author->favorite_blogs, "Author's favorite blogs are undefined by default");
+
+    # same as in MT::CMS::Dashboard, but that's not necessary
+    my $default_widgets = {
+        'blog_stats' =>
+          { param => { tab => 'entry' }, order => 1, set => 'main' },
+        'this_is_you-1' => { order => 1, set => 'sidebar' },
+        'mt_shortcuts'  => { order => 2, set => 'sidebar' },
+        'mt_news'       => { order => 3, set => 'sidebar' },
+    };
+
+my $fav_blogs = [1, 7];  # not actually a blog #7, but meh
+
+ok($author->widgets($default_widgets), "Author's widgets can be set");
+ok($author->favorite_blogs($fav_blogs), "Author's favorite blogs can be set");
+ok($author->save(), "Author with modified widgets can be saved");
+
+require MT::ObjectDriver::Driver::Cache::RAM;
+MT::ObjectDriver::Driver::Cache::RAM->clear_cache();
+
+$author = MT::Author->load({ name => 'Chuck D' });
+
+ok($author->widgets, "Modified author has widgets");
+is_deeply($author->widgets, $default_widgets, "Author's widgets survived being saved accurately");
+
+ok($author->favorite_blogs, "Modified author has favorite blogs");
+is_deeply($author->favorite_blogs, $fav_blogs, "Author's favorite blogs survived being saved accurately");
+