From d7b45a3ed20e6d4230faa812616a6031001c8977 Mon Sep 17 00:00:00 2001 From: BlueWall Date: Wed, 4 Mar 2015 19:27:34 -0500 Subject: [PATCH] Alter the migrations so that it is a no-op as the columns are unused and the operation is very expensive --- OpenSim/Data/MySQL/Resources/AssetStore.migrations | 3 ++- OpenSim/Data/MySQL/Resources/XAssetStore.migrations | 3 --- OpenSim/Data/PGSQL/Resources/AssetStore.migrations | 3 ++- OpenSim/Data/PGSQL/Resources/XAssetStore.migrations | 3 --- OpenSim/Framework/AssetBase.cs | 2 +- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/OpenSim/Data/MySQL/Resources/AssetStore.migrations b/OpenSim/Data/MySQL/Resources/AssetStore.migrations index 2c5e7c389c..661d825569 100644 --- a/OpenSim/Data/MySQL/Resources/AssetStore.migrations +++ b/OpenSim/Data/MySQL/Resources/AssetStore.migrations @@ -77,4 +77,5 @@ ALTER TABLE assets ADD COLUMN CreatorID varchar(128) NOT NULL DEFAULT ''; :VERSION 9 -ALTER TABLE assets MODIFY description varchar(128); +BEGIN; +COMMIT; diff --git a/OpenSim/Data/MySQL/Resources/XAssetStore.migrations b/OpenSim/Data/MySQL/Resources/XAssetStore.migrations index d56c917865..9459e3e14e 100644 --- a/OpenSim/Data/MySQL/Resources/XAssetStore.migrations +++ b/OpenSim/Data/MySQL/Resources/XAssetStore.migrations @@ -29,7 +29,4 @@ COMMIT; :VERSION 2 BEGIN; - -ALTER TABLE xassetsmeta MODIFY Description varchar(128); - COMMIT; diff --git a/OpenSim/Data/PGSQL/Resources/AssetStore.migrations b/OpenSim/Data/PGSQL/Resources/AssetStore.migrations index fb7d1566ab..7a858b4100 100644 --- a/OpenSim/Data/PGSQL/Resources/AssetStore.migrations +++ b/OpenSim/Data/PGSQL/Resources/AssetStore.migrations @@ -95,4 +95,5 @@ alter table assets add "creatorid" varchar(36) not null default ''; :VERSION 8 -ALTER TABLE assets ALTER COLUMN description TYPE varchar(128); +BEGIN TRANSACTION; +COMMIT; diff --git a/OpenSim/Data/PGSQL/Resources/XAssetStore.migrations b/OpenSim/Data/PGSQL/Resources/XAssetStore.migrations index 0e22091a00..df9d821bd2 100644 --- a/OpenSim/Data/PGSQL/Resources/XAssetStore.migrations +++ b/OpenSim/Data/PGSQL/Resources/XAssetStore.migrations @@ -77,7 +77,4 @@ COMMIT; :VERSION 5 BEGIN; - -ALTER TABLE xassetsmeta ALTER COLUMN description TYPE varchar(128); - COMMIT; diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs index 0c1fdda519..153a1d0caf 100644 --- a/OpenSim/Framework/AssetBase.cs +++ b/OpenSim/Framework/AssetBase.cs @@ -51,7 +51,7 @@ namespace OpenSim.Framework private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); public static readonly int MAX_ASSET_NAME = 64; - public static readonly int MAX_ASSET_DESC = 128; + public static readonly int MAX_ASSET_DESC = 64; /// /// Data of the Asset