Changeset 2040

Timestamp:

04/22/08 23:02:23 (7 months ago)

Author:

mpaschal

Message:

Improve process of converting metadata from serialized blobs to auxiliary tables
BugzID: 79409

Files:

• branches/release-35/lib/MT/Upgrade.pm (modified) (7 diffs)

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

@@ -898 +898 @@
-sub core_upgrade_meta {
-    my $self = shift;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return 0;
+}
+
+sub _save_meta {
+    my $self = shift;
+    my ($obj, $type, $value) = @_;
+
+    my $meta_obj = $obj->meta_pkg->new;
+
+    my @class_keys = @{ $obj->primary_key_tuple };
+    my @meta_keys  = @{ $meta_obj->primary_key_tuple };
+    for my $i (0..$#class_keys) {
+        my $class_field = $class_keys[$i];
+        my $meta_field  = $meta_keys[$i];
+        $meta_obj->$meta_field($obj->$class_field());
+    }
+
+    # Set the type without checking if it's defined, unlike real meta().
+    $meta_obj->type($type);
+
+    # Does this meta type have a data type defined?
+    my $datatype;
+    if (my $field = MT::Meta->metadata_by_name(ref $obj || $obj, $type)) {
+        if (my $type_id = $field->{type_id}) {
+            $datatype = $MT::Meta::Types{$type_id};
+        }
+    }
+    $datatype ||= 'vblob';
+
+    $meta_obj->$datatype($value);
+
+    my $meta_col_def = $meta_obj->column_def($datatype);
+    my $meta_is_blob = $meta_col_def ? $meta_col_def->{type} eq 'blob' : 0;
+    MT::Meta::Proxy::serialize_blob(undef, $meta_obj) if $meta_is_blob;
+    $meta_obj->save();
+    MT::Meta::Proxy::unserialize_blob($meta_obj) if $meta_is_blob;
-}
-
@@ -943 +996 @@
-    my $count = int($param{count} || 0);
-
-$param{step} . "_type"
+join q{:}, $param{step} . "_type", $class
-
-    my $msg = MT->translate("Upgrading metadata storage for [_1]", $class->class_label_plural);
@@ -967 +1020 @@
-    $stmt->add_where( $meta_col => { not_null => 1 } );
-    $stmt->limit( 101 );
-    $stmt->offset( $offset ) if $offset;
-
-    my $sql = join ' ', 'SELECT', $meta_col, ',', $id_col, 'FROM',
@@ -974 +1026 @@
-        $stmt->as_limit;
-
-
-    or return 0
+;
+return 0 if !$sth
-    $sth->execute
-        or return $self->error($dbh->errstr || $DBI::errstr);
@@ -1013 +1065 @@
-
-                                $changed++;
-obj->meta(
+self->_save_meta($obj, 
-                            }
-                        } else {
-                            $changed++;
-obj->meta(
+self->_save_meta($obj, 
-                        }
-                    }
-                    if ($changed) {
-                        $obj->save if $changed;
-                        push @ids, $obj->id;
-                    }
@@ -1028 +1079 @@
-        }
-        last if $rows == 100;
+    }
+    if ($rows == 100 && $sth->fetchrow_arrayref) {
+        $rows++;
-    }
-    $sth->finish;
@@ -1045 +1099 @@
-        $sql = $dbd->ddl_class->drop_column_sql($class, $param{meta_column} || 'meta');
-        $dbh->do($sql);
+        $self->progress($msg . ' (100%)', $pid);
-        $offset = 0;  # done!
-    }