ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove parts locking from data classes since these are using a copy of the scene object

Browse Source
This commit is contained in:
Justin Clark-Casey (justincc)
2010-08-26 00:17:26 +01:00
parent 166ab59420
commit 692cf3c657
4 changed files with 160 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
View File

@@ -89,7 +89,6 @@ namespace OpenSim.Data.MSSQL
Dictionary<UUID, SceneObjectGroup> objects = new Dictionary<UUID, SceneObjectGroup>();
SceneObjectGroup grp = null;
string sql = "SELECT *, " +
"sort = CASE WHEN prims.UUID = prims.SceneGroupID THEN 0 ELSE 1 END " +
"FROM prims " +
@@ -232,65 +231,62 @@ namespace OpenSim.Data.MSSQL
/// <param name="regionUUID"></param>
public void StoreObject(SceneObjectGroup obj, UUID regionUUID)
{
lock (obj.Children)
_Log.DebugFormat("[MSSQL]: Adding/Changing SceneObjectGroup: {0} to region: {1}, object has {2} prims.", obj.UUID, regionUUID, obj.Children.Count);
using (SqlConnection conn = new SqlConnection(m_connectionString))
{
_Log.DebugFormat("[MSSQL]: Adding/Changing SceneObjectGroup: {0} to region: {1}, object has {2} prims.", obj.UUID, regionUUID, obj.Children.Count);
using (SqlConnection conn = new SqlConnection(m_connectionString))
conn.Open();
SqlTransaction transaction = conn.BeginTransaction();
try
{
conn.Open();
SqlTransaction transaction = conn.BeginTransaction();
foreach (SceneObjectPart sceneObjectPart in obj.Children.Values)
{
//Update prim
using (SqlCommand sqlCommand = conn.CreateCommand())
{
sqlCommand.Transaction = transaction;
try
{
StoreSceneObjectPrim(sceneObjectPart, sqlCommand, obj.UUID, regionUUID);
}
catch (SqlException sqlEx)
{
_Log.ErrorFormat("[REGION DB]: Store SceneObjectPrim SQL error: {0} at line {1}", sqlEx.Message, sqlEx.LineNumber);
throw;
}
}
//Update primshapes
using (SqlCommand sqlCommand = conn.CreateCommand())
{
sqlCommand.Transaction = transaction;
try
{
StoreSceneObjectPrimShapes(sceneObjectPart, sqlCommand, obj.UUID, regionUUID);
}
catch (SqlException sqlEx)
{
_Log.ErrorFormat("[REGION DB]: Store SceneObjectPrimShapes SQL error: {0} at line {1}", sqlEx.Message, sqlEx.LineNumber);
throw;
}
}
}
transaction.Commit();
}
catch (Exception ex)
{
_Log.ErrorFormat("[REGION DB]: Store SceneObjectGroup error: {0}, Rolling back...", ex.Message);
try
{
foreach (SceneObjectPart sceneObjectPart in obj.Children.Values)
{
//Update prim
using (SqlCommand sqlCommand = conn.CreateCommand())
{
sqlCommand.Transaction = transaction;
try
{
StoreSceneObjectPrim(sceneObjectPart, sqlCommand, obj.UUID, regionUUID);
}
catch (SqlException sqlEx)
{
_Log.ErrorFormat("[REGION DB]: Store SceneObjectPrim SQL error: {0} at line {1}", sqlEx.Message, sqlEx.LineNumber);
throw;
}
}
//Update primshapes
using (SqlCommand sqlCommand = conn.CreateCommand())
{
sqlCommand.Transaction = transaction;
try
{
StoreSceneObjectPrimShapes(sceneObjectPart, sqlCommand, obj.UUID, regionUUID);
}
catch (SqlException sqlEx)
{
_Log.ErrorFormat("[REGION DB]: Store SceneObjectPrimShapes SQL error: {0} at line {1}", sqlEx.Message, sqlEx.LineNumber);
throw;
}
}
}
transaction.Commit();
transaction.Rollback();
}
catch (Exception ex)
catch (Exception ex2)
{
_Log.ErrorFormat("[REGION DB]: Store SceneObjectGroup error: {0}, Rolling back...", ex.Message);
try
{
transaction.Rollback();
}
catch (Exception ex2)
{
//Show error
_Log.InfoFormat("[REGION DB]: Rollback of SceneObjectGroup store transaction failed with error: {0}", ex2.Message);
}
//Show error
_Log.InfoFormat("[REGION DB]: Rollback of SceneObjectGroup store transaction failed with error: {0}", ex2.Message);
}
}
}