OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* remove unused CommitAssets() hook for now

0.6.0-stable
Justin Clarke Casey 2008-07-07 19:18:44 +00:00
parent 0b2fcbfec4
commit 1813946937
10 changed files with 1 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Data/AssetDataBase.cs
View File

@ -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; }

7
OpenSim/Data/MSSQL/MSSQLAssetData.cs
View File

@ -203,13 +203,6 @@ namespace OpenSim.Data.MSSQL
return false;
}
/// <summary>
/// All writes are immediately commited to the database, so this is a no-op
/// </summary>
override public void CommitAssets()
{
}
#endregion
#region IPlugin Members

7
OpenSim/Data/MySQL/MySQLAssetData.cs
View File

@ -304,13 +304,6 @@ namespace OpenSim.Data.MySQL
return assetExists;
}
/// <summary>
/// All writes are immediately commited to the database, so this is a no-op
/// </summary>
override public void CommitAssets()
{
}
#endregion
/// <summary>

6
OpenSim/Data/NHibernate/NHibernateAssetData.cs
View File

@ -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"; }
}

13
OpenSim/Data/SQLite/SQLiteAssetData.cs
View File

@ -223,19 +223,6 @@ namespace OpenSim.Data.SQLite
}
}
/// <summary>
/// commit
/// </summary>
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

5
OpenSim/Framework/Communications/Cache/AssetServerBase.cs
View File

@ -50,7 +50,6 @@ namespace OpenSim.Framework.Communications.Cache
protected IAssetLoader assetLoader = new AssetLoaderFileSystem();
protected abstract void StoreAsset(AssetBase asset);
protected abstract void CommitAssets();
/// <summary>
/// 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();
}
}

4
OpenSim/Framework/Communications/Cache/GridAssetClient.cs
View File

@ -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.");

7
OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
View File

@ -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();
}
}
}

1
OpenSim/Framework/IAssetProvider.cs
View File

@ -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);
}
}

3
OpenSim/Grid/AssetServer/RestService.cs
View File

@ -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[] {};
}