[mb-commits] branch, schema-changes-2013-05-15, created. Preparing schema change branch for 2013-05-15

The branch, schema-changes-2013-05-15 has been created
        at  430a0ebb177fd33112b52eb941ad1bc4fbe4b431 (commit)

- Log -----------------------------------------------------------------
commit 430a0ebb177fd33112b52eb941ad1bc4fbe4b431
Author: Oliver Charles <[email protected]>
Date:   Mon Feb 4 10:12:16 2013 +0000

    Preparing schema change branch for 2013-05-15

diff --git a/upgrade.sh b/upgrade.sh
index e73dabc..bad0017 100755
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -4,32 +4,18 @@ set -o errexit
 cd `dirname $0`
 eval `./admin/ShowDBDefs`
 
+NEW_SCHEMA_SEQUENCE=17
+OLD_SCHEMA_SEQUENCE=$((NEW_SCHEMA_SEQUENCE - 1))
+
 ################################################################################
 # Assert pre-conditions
 
-if [ "$DB_SCHEMA_SEQUENCE" != "15" ]
+if [ "$DB_SCHEMA_SEQUENCE" != "$OLD_SCHEMA_SEQUENCE") ]
 then
-    echo `date` : Error: Schema sequence must be 15 when you run this script
+    echo `date` : Error: Schema sequence must be $OLD_SCHEMA_SEQUENCE when you run this script
     exit -1
 fi
 
-# Slaves need to 'catch up' on the CAA tables. They cannot run the migration
-# unless this dump is present.
-if [ "$REPLICATION_TYPE" = "$RT_SLAVE" ]
-then
-    echo `date` : Downloading cover art archive metadata
-    mkdir -p catchup
-    OUTPUT=`wget -q "ftp://ftp.musicbrainz.org/pub/musicbrainz/data/schema-change-2012-10-15/mbdump-cover-art-archive.tar.bz2" -O catchup/mbdump-cover-art-archive.tar.bz2` || ( echo "$OUTPUT" ; exit 1 )
-
-    echo `date` : Catching up with cover_art_archive schema
-    OUTPUT=`echo 'DROP SCHEMA IF EXISTS cover_art_archive CASCADE' | ./admin/psql 2>&1` || ( echo "$OUTPUT" ; exit 1)
-    OUTPUT=`echo 'CREATE SCHEMA cover_art_archive' | ./admin/psql 2>&1` || ( echo "$OUTPUT" ; exit 1)
-    OUTPUT=`./admin/psql < admin/sql/updates/20121015-caa-as-of-schema-15.sql 2>&1` || ( echo "$OUTPUT" ; exit 1)
-    OUTPUT=`./admin/psql < admin/sql/caa/CreateFunctions.sql 2>&1` || ( echo "$OUTPUT" ; exit 1)
-    OUTPUT=`./admin/psql < admin/sql/caa/CreateViews.sql 2>&1` || ( echo "$OUTPUT" ; exit 1)
-    OUTPUT=`./admin/MBImport.pl --skip-editor catchup/mbdump-cover-art-archive.tar.bz2 2>&1` || ( echo "$OUTPUT" ; exit 1 )
-fi
-
 ################################################################################
 # Backup and disable replication triggers
 
@@ -44,13 +30,6 @@ then
     echo `date` : 'Drop replication triggers (statistics)'
     echo 'DROP TRIGGER "reptg_statistic" ON "statistic";
           DROP TRIGGER "reptg_statistic_event" ON "statistic_event";' | ./admin/psql READWRITE
-
-    echo `date` : Exporting just CAA tables for slaves to catchup
-    mkdir -p catchup
-    ./admin/ExportAllTables --table='cover_art_archive.art_type' \
-        --table='cover_art_archive.cover_art' \
-        --table='cover_art_archive.cover_art_type' \
-        -d catchup
 fi
 
 if [ "$REPLICATION_TYPE" != "$RT_SLAVE" ]
@@ -62,52 +41,6 @@ fi
 ################################################################################
 # Scripts that should run on *all* nodes (master/slave/standalone)
 
-echo `date` : Updating sequence values
-OUTPUT=`./admin/psql READWRITE < ./admin/sql/SetSequences.sql 2>&1` || ( echo "$OUTPUT" ; exit 1 )
-
-echo `date` : Applying admin/sql/updates/20121017-whitespace-functions.sql
-OUTPUT=`./admin/psql READWRITE < ./admin/sql/updates/20121017-whitespace-functions.sql 2>&1` || ( echo "$OUTPUT" ; exit 1 )
-
-echo `date` : Dropping broken indexes
-OUTPUT=`echo 'DROP INDEX IF EXISTS artist_idx_uniq_name_comment' | ./admin/psql 2>&1` || ( echo "$OUTPUT" ; exit 1)
-OUTPUT=`echo 'DROP INDEX IF EXISTS label_idx_uniq_name_comment' | ./admin/psql 2>&1` || ( echo "$OUTPUT" ; exit 1)
-
-echo `date` : Applying admin/sql/updates/20120220-merge-duplicate-credits.sql
-OUTPUT=`./admin/psql READWRITE < ./admin/sql/updates/20120220-merge-duplicate-credits.sql 2>&1` || ( echo "$OUTPUT" ; exit 1 )
-
-echo `date` : Applying admin/sql/updates/20120822-more-text-constraints.sql
-OUTPUT=`./admin/psql READWRITE < ./admin/sql/updates/20120822-more-text-constraints.sql 2>&1` || ( echo "$OUTPUT" ; exit 1 )
-
-echo `date` : Applying admin/sql/updates/20120917-rg-st-created.sql
-OUTPUT=`./admin/psql READWRITE < ./admin/sql/updates/20120917-rg-st-created.sql 2>&1` || ( echo "$OUTPUT" ; exit 1 )
-
-echo `date` : Applying admin/sql/updates/20120921-drop-url-descriptions.sql
-OUTPUT=`./admin/psql READWRITE < ./admin/sql/updates/20120921-drop-url-descriptions.sql 2>&1` || ( echo "$OUTPUT" ; exit 1 )
-
-echo `date` : Applying admin/sql/updates/20120922-move-statistics-tables.sql
-OUTPUT=`./admin/psql READWRITE < ./admin/sql/updates/20120922-move-statistics-tables.sql 2>&1` || ( echo "$OUTPUT" ; exit 1 )
-
-echo `date` : Applying admin/sql/updates/20120927-add-log-statistics.sql
-OUTPUT=`./admin/psql READWRITE < ./admin/sql/updates/20120927-add-log-statistics.sql 2>&1` || ( echo "$OUTPUT" ; exit 1 )
-
-if [ "$REPLICATION_TYPE" = "$RT_SLAVE" ]
-then
-    echo `date` : Applying admin/sql/updates/20120911-not-null-comments.sql
-    OUTPUT=`./admin/psql READWRITE < ./admin/sql/updates/20120911-not-null-comments.sql 2>&1` || ( echo "$OUTPUT" ; exit 1 )
-fi
-
-echo `date` : Applying admin/sql/updates/20120919-caa-edits-pending.sql
-OUTPUT=`./admin/psql READWRITE < ./admin/sql/updates/20120919-caa-edits-pending.sql 2>&1` || ( echo "$OUTPUT" ; exit 1 )
-
-echo `date` : Applying admin/sql/updates/20120921-release-group-cover-art.sql
-OUTPUT=`./admin/psql READWRITE < ./admin/sql/updates/20120921-release-group-cover-art.sql 2>&1` || ( echo "$OUTPUT" ; exit 1 )
-
-if [ "$REPLICATION_TYPE" = "$RT_SLAVE" ]
-then
-    echo `date` : Indexing new cover_art_archive data
-    OUTPUT=`./admin/psql < admin/sql/caa/CreatePrimaryKeys.sql 2>&1` || ( echo "$OUTPUT" ; exit 1)
-    OUTPUT=`./admin/psql < admin/sql/caa/CreateIndexes.sql 2>&1` || ( echo "$OUTPUT" ; exit 1)
-fi
 
 ################################################################################
 # Re-enable replication
@@ -133,29 +66,18 @@ then
 
     echo `date` : Enabling last_updated triggers
     ./admin/sql/EnableLastUpdatedTriggers.pl
-
-    echo `date` : Applying admin/sql/updates/20120822-more-text-constraints-master.sql
-    OUTPUT=`./admin/psql READWRITE < ./admin/sql/updates/20120822-more-text-constraints-master.sql 2>&1` || ( echo "$OUTPUT" ; exit 1 )
-
-    echo `date` : Applying admin/sql/updates/20120911-not-null-comments-master.sql
-    OUTPUT=`./admin/psql READWRITE < ./admin/sql/updates/20120911-not-null-comments-master.sql 2>&1` || ( echo "$OUTPUT" ; echo "This has *not* stopped migration, but will need to be re-ran later!" )
-
-    echo `date` : Applying admin/sql/updates/20120921-release-group-cover-art-master.sql
-    OUTPUT=`./admin/psql READWRITE < ./admin/sql/updates/20120921-release-group-cover-art-master.sql 2>&1` || ( echo "$OUTPUT" ; exit 1 )
-
 fi
 
 ################################################################################
 # Bump schema sequence
 
-DB_SCHEMA_SEQUENCE=16
-echo `date` : Going to schema sequence $DB_SCHEMA_SEQUENCE
-echo "UPDATE replication_control SET current_schema_sequence = $DB_SCHEMA_SEQUENCE;" | ./admin/psql READWRITE
+echo `date` : Going to schema sequence $NEW_SCHEMA_SEQUENCE
+#echo "UPDATE replication_control SET current_schema_sequence = $NEW_SCHEMA_SEQUENCE;" | ./admin/psql READWRITE
 
 ################################################################################
 # Prompt for final manual intervention
 
 echo `date` : Done
-echo `date` : UPDATE THE DB_SCHEMA_SEQUENCE IN DBDefs.pm TO $DB_SCHEMA_SEQUENCE !
+echo `date` : UPDATE THE DB_SCHEMA_SEQUENCE IN DBDefs.pm TO $NEW_SCHEMA_SEQUENCE !
 
 # eof

-----------------------------------------------------------------------


hooks/post-receive
-- 
mb_server