From 1813946937267edde79cb471c357f6cd85efd8ec Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Mon, 7 Jul 2008 19:18:44 +0000 Subject: * remove unused CommitAssets() hook for now --- OpenSim/Data/AssetDataBase.cs | 1 - OpenSim/Data/MSSQL/MSSQLAssetData.cs | 7 ------- OpenSim/Data/MySQL/MySQLAssetData.cs | 7 ------- OpenSim/Data/NHibernate/NHibernateAssetData.cs | 6 ------ OpenSim/Data/SQLite/SQLiteAssetData.cs | 13 ------------- OpenSim/Framework/Communications/Cache/AssetServerBase.cs | 5 ----- OpenSim/Framework/Communications/Cache/GridAssetClient.cs | 4 ---- OpenSim/Framework/Communications/Cache/SQLAssetServer.cs | 7 ------- OpenSim/Framework/IAssetProvider.cs | 1 - OpenSim/Grid/AssetServer/RestService.cs | 3 +-- 10 files changed, 1 insertion(+), 53 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Data/AssetDataBase.cs b/OpenSim/Data/AssetDataBase.cs index ca1de5a..6e9e085 100644 --- a/OpenSim/Data/AssetDataBase.cs +++ b/OpenSim/Data/AssetDataBase.cs @@ -36,7 +36,6 @@ namespace OpenSim.Data public abstract void CreateAsset(AssetBase asset); public abstract void UpdateAsset(AssetBase asset); public abstract bool ExistsAsset(LLUUID uuid); - public abstract void CommitAssets(); public abstract string Version { get; } public abstract string Name { get; } diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs index 3f2e8a7..108ceb1 100644 --- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs +++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs @@ -203,13 +203,6 @@ namespace OpenSim.Data.MSSQL return false; } - /// - /// All writes are immediately commited to the database, so this is a no-op - /// - override public void CommitAssets() - { - } - #endregion #region IPlugin Members diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs index 3557243..6cb0b4c 100644 --- a/OpenSim/Data/MySQL/MySQLAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLAssetData.cs @@ -304,13 +304,6 @@ namespace OpenSim.Data.MySQL return assetExists; } - /// - /// All writes are immediately commited to the database, so this is a no-op - /// - override public void CommitAssets() - { - } - #endregion /// diff --git a/OpenSim/Data/NHibernate/NHibernateAssetData.cs b/OpenSim/Data/NHibernate/NHibernateAssetData.cs index 174667e..eb4e14c 100644 --- a/OpenSim/Data/NHibernate/NHibernateAssetData.cs +++ b/OpenSim/Data/NHibernate/NHibernateAssetData.cs @@ -161,12 +161,6 @@ namespace OpenSim.Data.NHibernate } - override public void CommitAssets() // force a sync to the database - { - m_log.Info("[SQLITE]: Attempting commit"); - } - - public override string Name { get { return "NHibernate"; } } diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs index 8fa09fc..dde05bd 100644 --- a/OpenSim/Data/SQLite/SQLiteAssetData.cs +++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs @@ -223,19 +223,6 @@ namespace OpenSim.Data.SQLite } } - /// - /// commit - /// - override public void CommitAssets() // force a sync to the database - { - m_log.Info("[ASSET DB]: Attempting commit"); - // lock (ds) - // { - // da.Update(ds, "assets"); - // ds.AcceptChanges(); - // } - } - /*********************************************************************** * * Database Definition Functions diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs index 74b1976..f65b88f 100644 --- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs +++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs @@ -50,7 +50,6 @@ namespace OpenSim.Framework.Communications.Cache protected IAssetLoader assetLoader = new AssetLoaderFileSystem(); protected abstract void StoreAsset(AssetBase asset); - protected abstract void CommitAssets(); /// /// This method must be implemented by a subclass to retrieve the asset named in the @@ -108,8 +107,6 @@ namespace OpenSim.Framework.Communications.Cache m_log.Info("[ASSET SERVER]: Setting up asset database"); assetLoader.ForEachDefaultXmlAsset(StoreAsset); - - CommitAssets(); } public AssetServerBase() @@ -167,7 +164,6 @@ namespace OpenSim.Framework.Communications.Cache lock (m_syncLock) { m_assetProvider.UpdateAsset(asset); - m_assetProvider.CommitAssets(); } } @@ -176,7 +172,6 @@ namespace OpenSim.Framework.Communications.Cache lock (m_syncLock) { StoreAsset(asset); - CommitAssets(); } } diff --git a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs index 7787805..6caabcd 100644 --- a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs +++ b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs @@ -106,10 +106,6 @@ namespace OpenSim.Framework.Communications.Cache } } - protected override void CommitAssets() - { - } - public override void Close() { throw new Exception("The method or operation is not implemented."); diff --git a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs index 334c5bd..95696ee 100644 --- a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs +++ b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs @@ -74,8 +74,6 @@ namespace OpenSim.Framework.Communications.Cache public override void Close() { base.Close(); - - m_assetProvider.CommitAssets(); } protected override AssetBase GetAsset(AssetRequest req) @@ -93,10 +91,5 @@ namespace OpenSim.Framework.Communications.Cache { m_assetProvider.CreateAsset(asset); } - - protected override void CommitAssets() - { - m_assetProvider.CommitAssets(); - } } } diff --git a/OpenSim/Framework/IAssetProvider.cs b/OpenSim/Framework/IAssetProvider.cs index dcb79ea..a9d0e33 100644 --- a/OpenSim/Framework/IAssetProvider.cs +++ b/OpenSim/Framework/IAssetProvider.cs @@ -35,7 +35,6 @@ namespace OpenSim.Framework void CreateAsset(AssetBase asset); void UpdateAsset(AssetBase asset); bool ExistsAsset(LLUUID uuid); - void CommitAssets(); // force a sync to the database void Initialise(string connect); } } diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs index 98f86f1..372f5f8 100644 --- a/OpenSim/Grid/AssetServer/RestService.cs +++ b/OpenSim/Grid/AssetServer/RestService.cs @@ -136,9 +136,8 @@ namespace OpenSim.Grid.AssetServer XmlSerializer xs = new XmlSerializer(typeof (AssetBase)); AssetBase asset = (AssetBase) xs.Deserialize(request); - m_log.InfoFormat("[REST]: StoreAndCommitAsset {0}", asset.FullID); + m_log.InfoFormat("[REST]: Creating asset {0}", asset.FullID); m_assetProvider.CreateAsset(asset); - m_assetProvider.CommitAssets(); return new byte[] {}; } -- cgit v1.1