From 6ef9d4da901a346c232458317cca6268da888e2e Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Mon, 18 Aug 2008 00:39:10 +0000 Subject: Formatting cleanup. --- OpenSim/Data/MySQL/MySQLAssetData.cs | 8 +-- OpenSim/Data/MySQL/MySQLEstateData.cs | 62 ++++++++-------- OpenSim/Data/MySQL/MySQLGridData.cs | 6 +- OpenSim/Data/MySQL/MySQLInventoryData.cs | 18 ++--- OpenSim/Data/MySQL/MySQLLogData.cs | 8 +-- OpenSim/Data/MySQL/MySQLManager.cs | 18 ++--- OpenSim/Data/MySQL/MySQLRegionData.cs | 119 +++++++++++++++---------------- 7 files changed, 119 insertions(+), 120 deletions(-) (limited to 'OpenSim/Data/MySQL') diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs index cec736a..bdb1571 100644 --- a/OpenSim/Data/MySQL/MySQLAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLAssetData.cs @@ -144,11 +144,11 @@ namespace OpenSim.Data.MySQL _dbConnection.GetTableVersion(tableList); // if there is no table, return, migrations will handle it. - if (tableList["assets"] == null) + if (tableList["assets"] == null) return; // if there is a table, and we don't have a migration, set it to 1 - if (m.Version == 0) + if (m.Version == 0) m.Version = 1; } @@ -272,12 +272,12 @@ namespace OpenSim.Data.MySQL lock (_dbConnection) { _dbConnection.CheckConnection(); - + MySqlCommand cmd = new MySqlCommand( "SELECT id FROM assets WHERE id=?id", _dbConnection.Connection); - + cmd.Parameters.AddWithValue("?id", uuid.ToString()); try diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs index 8991e02..2ab7d40 100644 --- a/OpenSim/Data/MySQL/MySQLEstateData.cs +++ b/OpenSim/Data/MySQL/MySQLEstateData.cs @@ -51,7 +51,7 @@ namespace OpenSim.Data.MySQL private string m_connectionString; private long m_waitTimeout; private long m_waitTimeoutLeeway = 60 * TimeSpan.TicksPerSecond; - private long m_lastConnectionUse; + private long m_lastConnectionUse; private FieldInfo[] m_Fields; private Dictionary m_FieldMap = @@ -83,13 +83,13 @@ namespace OpenSim.Data.MySQL } m_log.Info("[REGION DB]: MySql - connecting: " + displayConnectionString); - + //m_log.Info("[ESTATE DB]: MySql - connecting: "+m_connectionString); m_connection = new MySqlConnection(m_connectionString); m_connection.Open(); - - GetWaitTimeout(); + + GetWaitTimeout(); Assembly assem = GetType().Assembly; Migration m = new Migration(m_connection, assem, "EstateStore"); @@ -106,7 +106,7 @@ namespace OpenSim.Data.MySQL m_FieldMap[f.Name.Substring(2)] = f; } } - + private string[] FieldList { get { return new List(m_FieldMap.Keys).ToArray(); } @@ -116,28 +116,28 @@ namespace OpenSim.Data.MySQL { MySqlCommand cmd = new MySqlCommand(m_waitTimeoutSelect, m_connection); - + using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow)) { if (dbReader.Read()) { - m_waitTimeout + m_waitTimeout = Convert.ToInt32(dbReader["@@wait_timeout"]) * TimeSpan.TicksPerSecond + m_waitTimeoutLeeway; - } - + } + dbReader.Close(); cmd.Dispose(); - } - + } + m_lastConnectionUse = System.DateTime.Now.Ticks; - + m_log.DebugFormat( "[REGION DB]: Connection wait timeout {0} seconds", - m_waitTimeout / TimeSpan.TicksPerSecond); + m_waitTimeout / TimeSpan.TicksPerSecond); } - + protected void CheckConnection() { long timeNow = System.DateTime.Now.Ticks; @@ -145,17 +145,17 @@ namespace OpenSim.Data.MySQL m_connection.State != ConnectionState.Open) { m_log.DebugFormat("[REGION DB]: Database connection has gone away - reconnecting"); - + lock (m_connection) { m_connection.Close(); m_connection = new MySqlConnection(m_connectionString); - m_connection.Open(); + m_connection.Open(); } } - - m_lastConnectionUse = timeNow; - } + + m_lastConnectionUse = timeNow; + } public EstateSettings LoadEstateSettings(LLUUID regionID) { @@ -210,7 +210,7 @@ namespace OpenSim.Data.MySQL names.Remove("EstateID"); sql = "insert into estate_settings ("+String.Join(",", names.ToArray())+") values ( ?"+String.Join(", ?", names.ToArray())+")"; - + cmd.CommandText = sql; cmd.Parameters.Clear(); @@ -318,7 +318,7 @@ namespace OpenSim.Data.MySQL es.ClearBans(); CheckConnection(); - + MySqlCommand cmd = m_connection.CreateCommand(); cmd.CommandText = "select bannedUUID from estateban where EstateID = ?EstateID"; @@ -344,18 +344,18 @@ namespace OpenSim.Data.MySQL private void SaveBanList(EstateSettings es) { CheckConnection(); - + MySqlCommand cmd = m_connection.CreateCommand(); - + cmd.CommandText = "delete from estateban where EstateID = ?EstateID"; cmd.Parameters.AddWithValue("?EstateID", es.EstateID.ToString()); cmd.ExecuteNonQuery(); - + cmd.Parameters.Clear(); cmd.CommandText = "insert into estateban (EstateID, bannedUUID) values ( ?EstateID, ?bannedUUID )"; - + foreach (EstateBan b in es.EstateBans) { cmd.Parameters.AddWithValue("?EstateID", es.EstateID.ToString()); @@ -369,18 +369,18 @@ namespace OpenSim.Data.MySQL void SaveUUIDList(uint EstateID, string table, LLUUID[] data) { CheckConnection(); - + MySqlCommand cmd = m_connection.CreateCommand(); - + cmd.CommandText = "delete from "+table+" where EstateID = ?EstateID"; cmd.Parameters.AddWithValue("?EstateID", EstateID.ToString()); cmd.ExecuteNonQuery(); - + cmd.Parameters.Clear(); cmd.CommandText = "insert into "+table+" (EstateID, uuid) values ( ?EstateID, ?uuid )"; - + foreach (LLUUID uuid in data) { cmd.Parameters.AddWithValue("?EstateID", EstateID.ToString()); @@ -396,7 +396,7 @@ namespace OpenSim.Data.MySQL List uuids = new List(); CheckConnection(); - + MySqlCommand cmd = m_connection.CreateCommand(); cmd.CommandText = "select uuid from "+table+" where EstateID = ?EstateID"; @@ -414,7 +414,7 @@ namespace OpenSim.Data.MySQL uuids.Add(uuid); } r.Close(); - + return uuids.ToArray(); } } diff --git a/OpenSim/Data/MySQL/MySQLGridData.cs b/OpenSim/Data/MySQL/MySQLGridData.cs index 4cddbe5..fcbceb8 100644 --- a/OpenSim/Data/MySQL/MySQLGridData.cs +++ b/OpenSim/Data/MySQL/MySQLGridData.cs @@ -49,8 +49,8 @@ namespace OpenSim.Data.MySQL /// private MySQLManager database; - override public void Initialise() - { + override public void Initialise() + { m_log.Info("[MySQLGridData]: " + Name + " cannot be default-initialized!"); throw new PluginNotInitialisedException (Name); } @@ -253,7 +253,7 @@ namespace OpenSim.Data.MySQL return null; } } - + /// /// Returns a sim profile from it's UUID /// diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs index dd4d804..4e8200b 100644 --- a/OpenSim/Data/MySQL/MySQLInventoryData.cs +++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs @@ -48,8 +48,8 @@ namespace OpenSim.Data.MySQL /// private MySQLManager database; - public void Initialise() - { + public void Initialise() + { m_log.Info("[MySQLInventoryData]: " + Name + " cannot be default-initialized!"); throw new PluginNotInitialisedException (Name); } @@ -81,7 +81,7 @@ namespace OpenSim.Data.MySQL string settingPassword = GridDataMySqlFile.ParseFileReadValue("password"); string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling"); string settingPort = GridDataMySqlFile.ParseFileReadValue("port"); - + database = new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, settingPort); @@ -147,7 +147,7 @@ namespace OpenSim.Data.MySQL } /// - /// + /// /// /// MySQL connection handler /// @@ -180,7 +180,7 @@ namespace OpenSim.Data.MySQL // ... and set the version if (m.Version == 0) m.Version = 1; - + } #endregion @@ -290,7 +290,7 @@ namespace OpenSim.Data.MySQL } } - + /// /// see /// @@ -708,10 +708,10 @@ namespace OpenSim.Data.MySQL * - We will only need to hit the database twice instead of n times. * - We assume the database is well-formed - no stranded/dangling folders, all folders in heirarchy owned * by the same person, each user only has 1 inventory heirarchy - * - The returned list is not ordered, instead of breadth-first ordered + * - The returned list is not ordered, instead of breadth-first ordered There are basically 2 usage cases for getFolderHeirarchy: 1) Getting the user's entire inventory heirarchy when they log in - 2) Finding a subfolder heirarchy to delete when emptying the trash. + 2) Finding a subfolder heirarchy to delete when emptying the trash. This implementation will pull all inventory folders from the database, and then prune away any folder that is not part of the requested sub-heirarchy. The theory is that it is cheaper to make 1 request from the database than to make n requests. This pays off only if requested heirarchy is large. @@ -774,7 +774,7 @@ namespace OpenSim.Data.MySQL while (reader.Read()) { InventoryFolderBase curFolder = readInventoryFolder(reader); - if (hashtable.ContainsKey(curFolder.ParentID)) // Current folder already has a sibling + if (hashtable.ContainsKey(curFolder.ParentID)) // Current folder already has a sibling hashtable[curFolder.ParentID].Add(curFolder); // append to sibling list else // else current folder has no known (yet) siblings { diff --git a/OpenSim/Data/MySQL/MySQLLogData.cs b/OpenSim/Data/MySQL/MySQLLogData.cs index 456cfd2..c02016c 100644 --- a/OpenSim/Data/MySQL/MySQLLogData.cs +++ b/OpenSim/Data/MySQL/MySQLLogData.cs @@ -44,12 +44,12 @@ namespace OpenSim.Data.MySQL /// public MySQLManager database; - public void Initialise() - { + public void Initialise() + { m_log.Info("[MySQLLogData]: " + Name + " cannot be default-initialized!"); throw new PluginNotInitialisedException (Name); } - + /// /// Artificial constructor called when the plugin is loaded /// Uses the obsolete mysql_connection.ini if connect string is empty. @@ -100,7 +100,7 @@ namespace OpenSim.Data.MySQL Dictionary tableList = new Dictionary(); tableList["logs"] = null; database.GetTableVersion(tableList); - + // migrations will handle it if (tableList["logs"] == null) return; diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs index 58599a8..6ad6609 100644 --- a/OpenSim/Data/MySQL/MySQLManager.cs +++ b/OpenSim/Data/MySQL/MySQLManager.cs @@ -55,7 +55,7 @@ namespace OpenSim.Data.MySQL private string connectionString; private const string m_waitTimeoutSelect = "select @@wait_timeout"; - + /// /// Wait timeout for our connection in ticks. /// @@ -70,7 +70,7 @@ namespace OpenSim.Data.MySQL /// /// Holds the last tick time that the connection was used. /// - private long m_lastConnectionUse; + private long m_lastConnectionUse; /// /// Initialises and creates a new MySQL connection and maintains it. @@ -172,7 +172,7 @@ namespace OpenSim.Data.MySQL // inaccuracy. m_lastConnectionUse = timeNow; } - + /// /// Get the connection being used /// @@ -287,14 +287,14 @@ namespace OpenSim.Data.MySQL { lock (dbcon) { - CheckConnection(); - + CheckConnection(); + MySqlCommand tablesCmd = new MySqlCommand( "SELECT TABLE_NAME, TABLE_COMMENT FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA=?dbname", dbcon); tablesCmd.Parameters.AddWithValue("?dbname", dbcon.Database); - + using (MySqlDataReader tables = tablesCmd.ExecuteReader()) { while (tables.Read()) @@ -541,7 +541,7 @@ namespace OpenSim.Data.MySQL LLUUID regionID = LLUUID.Zero; LLUUID.TryParse(reader["homeRegionID"].ToString(), out regionID); // it's ok if it doesn't work; just use LLUUID.Zero retval.HomeRegionID = regionID; - + retval.Created = Convert.ToInt32(reader["created"].ToString()); retval.LastLogin = Convert.ToInt32(reader["lastLogin"].ToString()); @@ -1124,7 +1124,7 @@ namespace OpenSim.Data.MySQL sql += "?skirt_item, ?skirt_asset)"; bool returnval = false; - + // we want to send in byte data, which means we can't just pass down strings try { MySqlCommand cmd = (MySqlCommand) dbcon.CreateCommand(); @@ -1160,7 +1160,7 @@ namespace OpenSim.Data.MySQL cmd.Parameters.AddWithValue("?underpants_asset", appearance.UnderPantsAsset.ToString()); cmd.Parameters.AddWithValue("?skirt_item", appearance.SkirtItem.ToString()); cmd.Parameters.AddWithValue("?skirt_asset", appearance.SkirtAsset.ToString()); - + if (cmd.ExecuteNonQuery() > 0) returnval = true; diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs index 70b6d3c..85af5df 100644 --- a/OpenSim/Data/MySQL/MySQLRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLRegionData.cs @@ -53,27 +53,27 @@ namespace OpenSim.Data.MySQL private const string m_terrainSelect = "select * from terrain limit 1"; private const string m_landSelect = "select * from land"; private const string m_landAccessListSelect = "select * from landaccesslist"; - private const string m_regionSettingsSelect = "select * from regionsettings"; + private const string m_regionSettingsSelect = "select * from regionsettings"; private const string m_waitTimeoutSelect = "select @@wait_timeout"; private MySqlConnection m_connection; private string m_connectionString; - + /// /// Wait timeout for our connection in ticks. /// private long m_waitTimeout; - + /// /// Make our storage of the timeout this amount smaller than it actually is, to give us a margin on long /// running database operations. /// private long m_waitTimeoutLeeway = 60 * TimeSpan.TicksPerSecond; - + /// /// Holds the last tick time that the connection was used. /// - private long m_lastConnectionUse; + private long m_lastConnectionUse; private DataSet m_dataSet; private MySqlDataAdapter m_primDataAdapter; @@ -105,7 +105,7 @@ namespace OpenSim.Data.MySQL public void Initialise(string connectionString) { m_connectionString = connectionString; - + m_dataSet = new DataSet(); int passPosition = 0; @@ -132,8 +132,8 @@ namespace OpenSim.Data.MySQL m_log.Info("[REGION DB]: MySql - connecting: " + displayConnectionString); m_connection = new MySqlConnection(m_connectionString); m_connection.Open(); - - GetWaitTimeout(); + + GetWaitTimeout(); // This actually does the roll forward assembly stuff Assembly assem = GetType().Assembly; @@ -177,12 +177,11 @@ namespace OpenSim.Data.MySQL m_dataSet.Tables.Add(m_shapeTable); SetupShapeCommands(m_shapeDataAdapter, m_connection); m_shapeDataAdapter.Fill(m_shapeTable); - - m_itemsTable = createItemsTable(); - m_dataSet.Tables.Add(m_itemsTable); - SetupItemsCommands(m_itemsDataAdapter, m_connection); - m_itemsDataAdapter.Fill(m_itemsTable); + m_itemsTable = createItemsTable(); + m_dataSet.Tables.Add(m_itemsTable); + SetupItemsCommands(m_itemsDataAdapter, m_connection); + m_itemsDataAdapter.Fill(m_itemsTable); m_terrainTable = createTerrainTable(); m_dataSet.Tables.Add(m_terrainTable); @@ -205,58 +204,58 @@ namespace OpenSim.Data.MySQL m_regionSettingsDataAdapter.Fill(m_regionSettingsTable); } } - + /// /// Get the wait_timeout value for our connection /// protected void GetWaitTimeout() { MySqlCommand cmd = new MySqlCommand(m_waitTimeoutSelect, m_connection); - + using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow)) { if (dbReader.Read()) { - m_waitTimeout + m_waitTimeout = Convert.ToInt32(dbReader["@@wait_timeout"]) * TimeSpan.TicksPerSecond + m_waitTimeoutLeeway; - } - + } + dbReader.Close(); cmd.Dispose(); - } - + } + m_lastConnectionUse = System.DateTime.Now.Ticks; - + m_log.DebugFormat( - "[REGION DB]: Connection wait timeout {0} seconds", m_waitTimeout / TimeSpan.TicksPerSecond); + "[REGION DB]: Connection wait timeout {0} seconds", m_waitTimeout / TimeSpan.TicksPerSecond); } - + /// /// Should be called before any db operation. This checks to see if the connection has not timed out /// protected void CheckConnection() { //m_log.Debug("[REGION DB]: Checking connection"); - + long timeNow = System.DateTime.Now.Ticks; if (timeNow - m_lastConnectionUse > m_waitTimeout || m_connection.State != ConnectionState.Open) { m_log.DebugFormat("[REGION DB]: Database connection has gone away - reconnecting"); - + lock (m_connection) { m_connection.Close(); m_connection = new MySqlConnection(m_connectionString); - m_connection.Open(); + m_connection.Open(); } } - + // Strictly, we should set this after the actual db operation. But it's more convenient to set here rather // than require the code to call another method - the timeout leeway should be large enough to cover the // inaccuracy. - m_lastConnectionUse = timeNow; - } - + m_lastConnectionUse = timeNow; + } + /// /// Given a list of tables, return the version of the tables, as seen in the database /// @@ -271,7 +270,7 @@ namespace OpenSim.Data.MySQL "SELECT TABLE_NAME, TABLE_COMMENT FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA=?dbname", dbcon); tablesCmd.Parameters.AddWithValue("?dbname", dbcon.Database); - + CheckConnection(); using (MySqlDataReader tables = tablesCmd.ExecuteReader()) { @@ -465,7 +464,7 @@ namespace OpenSim.Data.MySQL lock (m_dataSet) { - CheckConnection(); + CheckConnection(); DataRow[] primsForRegion = prims.Select(byRegion, orderByParent); m_log.Info("[REGION DB]: " + "Loaded " + primsForRegion.Length + " prims for region: " + regionUUID); @@ -587,10 +586,10 @@ namespace OpenSim.Data.MySQL using (cmd) { delete.Parameters.Add(new MySqlParameter("?RegionUUID", Util.ToRawUuidString(regionID))); - + CheckConnection(); delete.ExecuteNonQuery(); - + cmd.Parameters.Add(new MySqlParameter("?RegionUUID", Util.ToRawUuidString(regionID))); cmd.Parameters.Add(new MySqlParameter("?Revision", revision)); cmd.Parameters.Add(new MySqlParameter("?Heightfield", serializeTerrain(ter))); @@ -774,7 +773,7 @@ namespace OpenSim.Data.MySQL } /// - /// + /// /// /// /// @@ -805,7 +804,7 @@ namespace OpenSim.Data.MySQL } /// - /// + /// /// public void Commit() { @@ -845,7 +844,7 @@ namespace OpenSim.Data.MySQL **********************************************************************/ /// - /// + /// /// /// /// @@ -1139,7 +1138,7 @@ namespace OpenSim.Data.MySQL **********************************************************************/ /// - /// + /// /// /// /// @@ -1315,7 +1314,7 @@ namespace OpenSim.Data.MySQL } /// - /// + /// /// /// /// @@ -1374,14 +1373,14 @@ namespace OpenSim.Data.MySQL newData.UserLookAt = LLVector3.Zero; m_log.ErrorFormat("[PARCEL]: unable to get parcel telehub settings for {1}", newData.Name); } - + newData.ParcelAccessList = new List(); return newData; } /// - /// + /// /// /// /// @@ -1395,7 +1394,7 @@ namespace OpenSim.Data.MySQL } /// - /// + /// /// /// /// @@ -1419,7 +1418,7 @@ namespace OpenSim.Data.MySQL } /// - /// + /// /// /// /// @@ -1502,7 +1501,7 @@ namespace OpenSim.Data.MySQL } /// - /// + /// /// /// /// @@ -1532,7 +1531,7 @@ namespace OpenSim.Data.MySQL } /// - /// + /// /// private static void fillRegionSettingsRow(DataRow row, RegionSettings settings) { @@ -1573,7 +1572,7 @@ namespace OpenSim.Data.MySQL } /// - /// + /// /// /// /// @@ -1618,7 +1617,7 @@ namespace OpenSim.Data.MySQL } /// - /// + /// /// /// /// @@ -1631,7 +1630,7 @@ namespace OpenSim.Data.MySQL } /// - /// + /// /// /// /// @@ -1694,7 +1693,7 @@ namespace OpenSim.Data.MySQL } /// - /// + /// /// /// /// @@ -1731,7 +1730,7 @@ namespace OpenSim.Data.MySQL row["ProfileHollow"] = s.ProfileHollow; row["Texture"] = s.TextureEntry; row["ExtraParams"] = s.ExtraParams; - + try { row["State"] = s.State; @@ -1754,7 +1753,7 @@ namespace OpenSim.Data.MySQL } /// - /// + /// /// /// /// @@ -1911,7 +1910,7 @@ namespace OpenSim.Data.MySQL } /// - /// + /// /// /// /// @@ -1973,7 +1972,7 @@ namespace OpenSim.Data.MySQL } /// - /// + /// /// /// /// @@ -1994,7 +1993,7 @@ namespace OpenSim.Data.MySQL } /// - /// + /// /// /// /// @@ -2027,7 +2026,7 @@ namespace OpenSim.Data.MySQL } /// - /// + /// /// /// /// @@ -2038,7 +2037,7 @@ namespace OpenSim.Data.MySQL } /// - /// + /// /// /// /// @@ -2052,7 +2051,7 @@ namespace OpenSim.Data.MySQL } /// - /// + /// /// /// /// @@ -2063,7 +2062,7 @@ namespace OpenSim.Data.MySQL } /// - /// + /// /// /// /// @@ -2082,7 +2081,7 @@ namespace OpenSim.Data.MySQL } /// - /// + /// /// /// MySQL connection handler // private static void InitDB(MySqlConnection conn) @@ -2174,7 +2173,7 @@ namespace OpenSim.Data.MySQL // } /// - /// + /// /// /// /// -- cgit v1.1