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

Properly lock new separate database accesses

ThreadPoolClientBranch
Justin Clarke Casey 2008-01-21 15:12:00 +00:00
parent 504ae63669
commit 7ca8e28a9a
2 changed files with 118 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
View File

@ -1203,72 +1203,75 @@ namespace OpenSim.Framework.Data.MySQL
MainLog.Instance.Verbose("DATASTORE", "Entered StorePrimInventory with prim ID {0}", primID); MainLog.Instance.Verbose("DATASTORE", "Entered StorePrimInventory with prim ID {0}", primID);
// Find all existing inventory rows for this prim lock (m_dataSet)
DataTable dbItems = m_itemsTable;
String sql = String.Format("primID = '{0}'", primID);
DataRow[] dbItemRows = dbItems.Select(sql);
// Build structures for manipulation purposes
IDictionary<String, DataRow> dbItemsToRemove = new Dictionary<String, DataRow>();
ICollection<TaskInventoryItem> itemsToAdd = new List<TaskInventoryItem>();
foreach (DataRow row in dbItemRows)
{ {
// MainLog.Instance.Verbose( // Find all existing inventory rows for this prim
// "DATASTORE", DataTable dbItems = m_itemsTable;
// "Found item {0}, {1} in prim id {2}",
// row["name"], row["itemID"], primID);
dbItemsToRemove.Add((String)row["itemID"], row); String sql = String.Format("primID = '{0}'", primID);
} DataRow[] dbItemRows = dbItems.Select(sql);
// Eliminate rows from the deletion set which already exist for this prim's inventory // Build structures for manipulation purposes
// TODO Very temporary, need to take account of simple metadata changes soon IDictionary<String, DataRow> dbItemsToRemove = new Dictionary<String, DataRow>();
lock (items) ICollection<TaskInventoryItem> itemsToAdd = new List<TaskInventoryItem>();
{
foreach (LLUUID itemId in items.Keys) foreach (DataRow row in dbItemRows)
{ {
String rawItemId = itemId.ToString(); // MainLog.Instance.Verbose(
// "DATASTORE",
// "Found item {0}, {1} in prim id {2}",
// row["name"], row["itemID"], primID);
if (dbItemsToRemove.ContainsKey(rawItemId)) dbItemsToRemove.Add((String)row["itemID"], row);
{ }
// MainLog.Instance.Verbose(
// "DATASTORE",
// "Discarding item {0}, {1} from remove candidates for prim id {2}",
// items[itemId].Name, rawItemId, primID);
dbItemsToRemove.Remove(rawItemId); // Eliminate rows from the deletion set which already exist for this prim's inventory
} // TODO Very temporary, need to take account of simple metadata changes soon
else lock (items)
{
foreach (LLUUID itemId in items.Keys)
{ {
itemsToAdd.Add(items[itemId]); String rawItemId = itemId.ToString();
if (dbItemsToRemove.ContainsKey(rawItemId))
{
// MainLog.Instance.Verbose(
// "DATASTORE",
// "Discarding item {0}, {1} from remove candidates for prim id {2}",
// items[itemId].Name, rawItemId, primID);
dbItemsToRemove.Remove(rawItemId);
}
else
{
itemsToAdd.Add(items[itemId]);
}
} }
} }
}
// Delete excess rows // Delete excess rows
foreach (DataRow row in dbItemsToRemove.Values) foreach (DataRow row in dbItemsToRemove.Values)
{ {
MainLog.Instance.Verbose( MainLog.Instance.Verbose(
"DATASTORE", "DATASTORE",
"Removing item {0}, {1} from prim ID {2}", "Removing item {0}, {1} from prim ID {2}",
row["name"], row["itemID"], row["primID"]); row["name"], row["itemID"], row["primID"]);
row.Delete(); row.Delete();
} }
// Insert items not already present // Insert items not already present
foreach (TaskInventoryItem newItem in itemsToAdd) foreach (TaskInventoryItem newItem in itemsToAdd)
{ {
MainLog.Instance.Verbose( MainLog.Instance.Verbose(
"DATASTORE", "DATASTORE",
"Adding item {0}, {1} to prim ID {2}", "Adding item {0}, {1} to prim ID {2}",
newItem.Name, newItem.ItemID, newItem.ParentPartID); newItem.Name, newItem.ItemID, newItem.ParentPartID);
DataRow newItemRow = dbItems.NewRow(); DataRow newItemRow = dbItems.NewRow();
fillItemRow(newItemRow, newItem); fillItemRow(newItemRow, newItem);
dbItems.Rows.Add(newItemRow); dbItems.Rows.Add(newItemRow);
}
} }
} }

95
OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs
View File

@ -1258,63 +1258,66 @@ namespace OpenSim.Framework.Data.SQLite
MainLog.Instance.Verbose("DATASTORE", "Entered StorePrimInventory with prim ID {0}", primID); MainLog.Instance.Verbose("DATASTORE", "Entered StorePrimInventory with prim ID {0}", primID);
// Find all existing inventory rows for this prim lock (ds)
DataTable dbItems = ds.Tables["primitems"];
String sql = String.Format("primID = '{0}'", primID);
DataRow[] dbItemRows = dbItems.Select(sql);
// Build structures for manipulation purposes
IDictionary<String, DataRow> dbItemsToRemove = new Dictionary<String, DataRow>();
ICollection<TaskInventoryItem> itemsToAdd
= new List<TaskInventoryItem>();
foreach (DataRow row in dbItemRows)
{ {
dbItemsToRemove.Add((String)row["itemID"], row); // Find all existing inventory rows for this prim
} DataTable dbItems = ds.Tables["primitems"];
// Eliminate rows from the deletion set which already exist for this prim's inventory String sql = String.Format("primID = '{0}'", primID);
// TODO Very temporary, need to take account of simple metadata changes soon DataRow[] dbItemRows = dbItems.Select(sql);
lock (items)
{ // Build structures for manipulation purposes
foreach (LLUUID itemId in items.Keys) IDictionary<String, DataRow> dbItemsToRemove = new Dictionary<String, DataRow>();
ICollection<TaskInventoryItem> itemsToAdd
= new List<TaskInventoryItem>();
foreach (DataRow row in dbItemRows)
{ {
String rawItemId = itemId.ToString(); dbItemsToRemove.Add((String)row["itemID"], row);
}
if (dbItemsToRemove.ContainsKey(rawItemId)) // Eliminate rows from the deletion set which already exist for this prim's inventory
// TODO Very temporary, need to take account of simple metadata changes soon
lock (items)
{
foreach (LLUUID itemId in items.Keys)
{ {
dbItemsToRemove.Remove(rawItemId); String rawItemId = itemId.ToString();
}
else if (dbItemsToRemove.ContainsKey(rawItemId))
{ {
itemsToAdd.Add(items[itemId]); dbItemsToRemove.Remove(rawItemId);
}
else
{
itemsToAdd.Add(items[itemId]);
}
} }
} }
}
// Delete excess rows // Delete excess rows
foreach (DataRow row in dbItemsToRemove.Values) foreach (DataRow row in dbItemsToRemove.Values)
{ {
MainLog.Instance.Verbose( MainLog.Instance.Verbose(
"DATASTORE", "DATASTORE",
"Removing item {0}, {1} from prim ID {2}", "Removing item {0}, {1} from prim ID {2}",
row["name"], row["itemID"], row["primID"]); row["name"], row["itemID"], row["primID"]);
row.Delete(); row.Delete();
} }
// Insert items not already present // Insert items not already present
foreach (TaskInventoryItem newItem in itemsToAdd) foreach (TaskInventoryItem newItem in itemsToAdd)
{ {
MainLog.Instance.Verbose( MainLog.Instance.Verbose(
"DATASTORE", "DATASTORE",
"Adding item {0}, {1} to prim ID {2}", "Adding item {0}, {1} to prim ID {2}",
newItem.Name, newItem.ItemID, newItem.ParentPartID); newItem.Name, newItem.ItemID, newItem.ParentPartID);
DataRow newItemRow = dbItems.NewRow(); DataRow newItemRow = dbItems.NewRow();
fillItemRow(newItemRow, newItem); fillItemRow(newItemRow, newItem);
dbItems.Rows.Add(newItemRow); dbItems.Rows.Add(newItemRow);
}
} }
} }