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

Change the table and field names of XAssetService mysql db tables to be capitalized like Avatars, Friends, etc. 

Also fixes access time being set on assets rather than XAssetsMeta
This is to try and be somewhat consistent with other service tables that are mainly in this style.
No migration is supplied, since nobody should be using this service yet except on a test basis.
user_profiles
Justin Clark-Casey (justincc) 2013-03-15 23:42:16 +00:00
parent e9f3cd1a60
commit 35843e8ec8
2 changed files with 60 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
OpenSim/Data/MySQL/MySQLXAssetData.cs
View File

@ -138,10 +138,10 @@ namespace OpenSim.Data.MySQL
dbcon.Open(); dbcon.Open();
using (MySqlCommand cmd = new MySqlCommand( using (MySqlCommand cmd = new MySqlCommand(
"SELECT name, description, access_time, asset_type, local, temporary, asset_flags, creator_id, data FROM xassetsmeta JOIN xassetsdata ON xassetsmeta.hash = xassetsdata.hash WHERE id=?id", "SELECT Name, Description, AccessTime, AssetType, Local, Temporary, AssetFlags, CreatorID, Data FROM XAssetsMeta JOIN XAssetsData ON XAssetsMeta.Hash = XAssetsData.Hash WHERE ID=?ID",
dbcon)) dbcon))
{ {
cmd.Parameters.AddWithValue("?id", assetID.ToString()); cmd.Parameters.AddWithValue("?ID", assetID.ToString());
try try
{ {
@ -149,18 +149,18 @@ namespace OpenSim.Data.MySQL
{ {
if (dbReader.Read()) if (dbReader.Read())
{ {
asset = new AssetBase(assetID, (string)dbReader["name"], (sbyte)dbReader["asset_type"], dbReader["creator_id"].ToString()); asset = new AssetBase(assetID, (string)dbReader["Name"], (sbyte)dbReader["AssetType"], dbReader["CreatorID"].ToString());
asset.Data = (byte[])dbReader["data"]; asset.Data = (byte[])dbReader["Data"];
asset.Description = (string)dbReader["description"]; asset.Description = (string)dbReader["Description"];
string local = dbReader["local"].ToString(); string local = dbReader["Local"].ToString();
if (local.Equals("1") || local.Equals("true", StringComparison.InvariantCultureIgnoreCase)) if (local.Equals("1") || local.Equals("true", StringComparison.InvariantCultureIgnoreCase))
asset.Local = true; asset.Local = true;
else else
asset.Local = false; asset.Local = false;
asset.Temporary = Convert.ToBoolean(dbReader["temporary"]); asset.Temporary = Convert.ToBoolean(dbReader["Temporary"]);
asset.Flags = (AssetFlags)Convert.ToInt32(dbReader["asset_flags"]); asset.Flags = (AssetFlags)Convert.ToInt32(dbReader["AssetFlags"]);
if (m_enableCompression) if (m_enableCompression)
{ {
@ -177,13 +177,13 @@ namespace OpenSim.Data.MySQL
} }
} }
UpdateAccessTime(asset.Metadata, (int)dbReader["access_time"]); UpdateAccessTime(asset.Metadata, (int)dbReader["AccessTime"]);
} }
} }
} }
catch (Exception e) catch (Exception e)
{ {
m_log.Error("[MYSQL XASSET DATA]: Failure fetching asset " + assetID + ": " + e.Message); m_log.Error(string.Format("[MYSQL XASSET DATA]: Failure fetching asset {0}", assetID), e);
} }
} }
} }
@ -249,23 +249,23 @@ namespace OpenSim.Data.MySQL
{ {
using (MySqlCommand cmd = using (MySqlCommand cmd =
new MySqlCommand( new MySqlCommand(
"replace INTO xassetsmeta(id, hash, name, description, asset_type, local, temporary, create_time, access_time, asset_flags, creator_id)" + "replace INTO XAssetsMeta(ID, Hash, Name, Description, AssetType, Local, Temporary, CreateTime, AccessTime, AssetFlags, CreatorID)" +
"VALUES(?id, ?hash, ?name, ?description, ?asset_type, ?local, ?temporary, ?create_time, ?access_time, ?asset_flags, ?creator_id)", "VALUES(?ID, ?Hash, ?Name, ?Description, ?AssetType, ?Local, ?Temporary, ?CreateTime, ?AccessTime, ?AssetFlags, ?CreatorID)",
dbcon)) dbcon))
{ {
// create unix epoch time // create unix epoch time
int now = (int)Utils.DateTimeToUnixTime(DateTime.UtcNow); int now = (int)Utils.DateTimeToUnixTime(DateTime.UtcNow);
cmd.Parameters.AddWithValue("?id", asset.ID); cmd.Parameters.AddWithValue("?ID", asset.ID);
cmd.Parameters.AddWithValue("?hash", hash); cmd.Parameters.AddWithValue("?Hash", hash);
cmd.Parameters.AddWithValue("?name", assetName); cmd.Parameters.AddWithValue("?Name", assetName);
cmd.Parameters.AddWithValue("?description", assetDescription); cmd.Parameters.AddWithValue("?Description", assetDescription);
cmd.Parameters.AddWithValue("?asset_type", asset.Type); cmd.Parameters.AddWithValue("?AssetType", asset.Type);
cmd.Parameters.AddWithValue("?local", asset.Local); cmd.Parameters.AddWithValue("?Local", asset.Local);
cmd.Parameters.AddWithValue("?temporary", asset.Temporary); cmd.Parameters.AddWithValue("?Temporary", asset.Temporary);
cmd.Parameters.AddWithValue("?create_time", now); cmd.Parameters.AddWithValue("?CreateTime", now);
cmd.Parameters.AddWithValue("?access_time", now); cmd.Parameters.AddWithValue("?AccessTime", now);
cmd.Parameters.AddWithValue("?creator_id", asset.Metadata.CreatorID); cmd.Parameters.AddWithValue("?CreatorID", asset.Metadata.CreatorID);
cmd.Parameters.AddWithValue("?asset_flags", (int)asset.Flags); cmd.Parameters.AddWithValue("?AssetFlags", (int)asset.Flags);
cmd.ExecuteNonQuery(); cmd.ExecuteNonQuery();
} }
} }
@ -285,11 +285,11 @@ namespace OpenSim.Data.MySQL
{ {
using (MySqlCommand cmd = using (MySqlCommand cmd =
new MySqlCommand( new MySqlCommand(
"INSERT INTO xassetsdata(hash, data) VALUES(?hash, ?data)", "INSERT INTO XAssetsData(Hash, Data) VALUES(?Hash, ?Data)",
dbcon)) dbcon))
{ {
cmd.Parameters.AddWithValue("?hash", hash); cmd.Parameters.AddWithValue("?Hash", hash);
cmd.Parameters.AddWithValue("?data", asset.Data); cmd.Parameters.AddWithValue("?Data", asset.Data);
cmd.ExecuteNonQuery(); cmd.ExecuteNonQuery();
} }
} }
@ -332,15 +332,15 @@ namespace OpenSim.Data.MySQL
{ {
dbcon.Open(); dbcon.Open();
MySqlCommand cmd = MySqlCommand cmd =
new MySqlCommand("update assets set access_time=?access_time where id=?id", dbcon); new MySqlCommand("update XAssetsMeta set AccessTime=?AccessTime where ID=?ID", dbcon);
try try
{ {
using (cmd) using (cmd)
{ {
// create unix epoch time // create unix epoch time
cmd.Parameters.AddWithValue("?id", assetMetadata.ID); cmd.Parameters.AddWithValue("?ID", assetMetadata.ID);
cmd.Parameters.AddWithValue("?access_time", (int)Utils.DateTimeToUnixTime(now)); cmd.Parameters.AddWithValue("?AccessTime", (int)Utils.DateTimeToUnixTime(now));
cmd.ExecuteNonQuery(); cmd.ExecuteNonQuery();
} }
} }
@ -368,9 +368,9 @@ namespace OpenSim.Data.MySQL
bool exists = false; bool exists = false;
using (MySqlCommand cmd = new MySqlCommand("SELECT hash FROM xassetsdata WHERE hash=?hash", dbcon)) using (MySqlCommand cmd = new MySqlCommand("SELECT Hash FROM XAssetsData WHERE Hash=?Hash", dbcon))
{ {
cmd.Parameters.AddWithValue("?hash", hash); cmd.Parameters.AddWithValue("?Hash", hash);
try try
{ {
@ -410,9 +410,9 @@ namespace OpenSim.Data.MySQL
using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
{ {
dbcon.Open(); dbcon.Open();
using (MySqlCommand cmd = new MySqlCommand("SELECT id FROM xassetsmeta WHERE id=?id", dbcon)) using (MySqlCommand cmd = new MySqlCommand("SELECT ID FROM XAssetsMeta WHERE ID=?ID", dbcon))
{ {
cmd.Parameters.AddWithValue("?id", uuid.ToString()); cmd.Parameters.AddWithValue("?ID", uuid.ToString());
try try
{ {
@ -427,8 +427,7 @@ namespace OpenSim.Data.MySQL
} }
catch (Exception e) catch (Exception e)
{ {
m_log.ErrorFormat( m_log.Error(string.Format("[XASSETS DB]: MySql failure fetching asset {0}", uuid), e);
"[XASSETS DB]: MySql failure fetching asset {0}" + Environment.NewLine + e.ToString(), uuid);
} }
} }
} }
@ -438,7 +437,6 @@ namespace OpenSim.Data.MySQL
} }
/// <summary> /// <summary>
/// Returns a list of AssetMetadata objects. The list is a subset of /// Returns a list of AssetMetadata objects. The list is a subset of
/// the entire data set offset by <paramref name="start" /> containing /// the entire data set offset by <paramref name="start" /> containing
@ -456,7 +454,7 @@ namespace OpenSim.Data.MySQL
using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
{ {
dbcon.Open(); dbcon.Open();
MySqlCommand cmd = new MySqlCommand("SELECT name,description,access_time,asset_type,temporary,id,asset_flags,creator_id FROM xassetsmeta LIMIT ?start, ?count", dbcon); MySqlCommand cmd = new MySqlCommand("SELECT Name, Description, AccessTime, AssetType, Temporary, ID, AssetFlags, CreatorID FROM XAssetsMeta LIMIT ?start, ?count", dbcon);
cmd.Parameters.AddWithValue("?start", start); cmd.Parameters.AddWithValue("?start", start);
cmd.Parameters.AddWithValue("?count", count); cmd.Parameters.AddWithValue("?count", count);
@ -467,18 +465,18 @@ namespace OpenSim.Data.MySQL
while (dbReader.Read()) while (dbReader.Read())
{ {
AssetMetadata metadata = new AssetMetadata(); AssetMetadata metadata = new AssetMetadata();
metadata.Name = (string)dbReader["name"]; metadata.Name = (string)dbReader["Name"];
metadata.Description = (string)dbReader["description"]; metadata.Description = (string)dbReader["Description"];
metadata.Type = (sbyte)dbReader["asset_type"]; metadata.Type = (sbyte)dbReader["AssetType"];
metadata.Temporary = Convert.ToBoolean(dbReader["temporary"]); // Not sure if this is correct. metadata.Temporary = Convert.ToBoolean(dbReader["Temporary"]); // Not sure if this is correct.
metadata.Flags = (AssetFlags)Convert.ToInt32(dbReader["asset_flags"]); metadata.Flags = (AssetFlags)Convert.ToInt32(dbReader["AssetFlags"]);
metadata.FullID = DBGuid.FromDB(dbReader["id"]); metadata.FullID = DBGuid.FromDB(dbReader["ID"]);
metadata.CreatorID = dbReader["creator_id"].ToString(); metadata.CreatorID = dbReader["CreatorID"].ToString();
// We'll ignore this for now - it appears unused! // We'll ignore this for now - it appears unused!
// metadata.SHA1 = dbReader["hash"]); // metadata.SHA1 = dbReader["hash"]);
UpdateAccessTime(metadata, (int)dbReader["access_time"]); UpdateAccessTime(metadata, (int)dbReader["AccessTime"]);
retList.Add(metadata); retList.Add(metadata);
} }
@ -504,9 +502,9 @@ namespace OpenSim.Data.MySQL
{ {
dbcon.Open(); dbcon.Open();
using (MySqlCommand cmd = new MySqlCommand("delete from xassetsmeta where id=?id", dbcon)) using (MySqlCommand cmd = new MySqlCommand("delete from XAssetsMeta where ID=?ID", dbcon))
{ {
cmd.Parameters.AddWithValue("?id", id); cmd.Parameters.AddWithValue("?ID", id);
cmd.ExecuteNonQuery(); cmd.ExecuteNonQuery();
} }

30
OpenSim/Data/MySQL/Resources/XAssetStore.migrations
View File

@ -3,24 +3,24 @@
BEGIN; BEGIN;
CREATE TABLE `xassetsmeta` ( CREATE TABLE `XAssetsMeta` (
`id` char(36) NOT NULL, `ID` char(36) NOT NULL,
`hash` binary(32) NOT NULL, `Hash` binary(32) NOT NULL,
`name` varchar(64) NOT NULL, `Name` varchar(64) NOT NULL,
`description` varchar(64) NOT NULL, `Description` varchar(64) NOT NULL,
`asset_type` tinyint(4) NOT NULL, `AssetType` tinyint(4) NOT NULL,
`local` tinyint(1) NOT NULL, `Local` tinyint(1) NOT NULL,
`temporary` tinyint(1) NOT NULL, `Temporary` tinyint(1) NOT NULL,
`create_time` int(11) NOT NULL, `CreateTime` int(11) NOT NULL,
`access_time` int(11) NOT NULL, `AccessTime` int(11) NOT NULL,
`asset_flags` int(11) NOT NULL, `AssetFlags` int(11) NOT NULL,
`creator_id` varchar(128) NOT NULL, `CreatorID` varchar(128) NOT NULL,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Version 1'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Version 1';
CREATE TABLE `xassetsdata` ( CREATE TABLE `XAssetsData` (
`hash` binary(32) NOT NULL, `Hash` binary(32) NOT NULL,
`data` longblob NOT NULL, `Data` longblob NOT NULL,
PRIMARY KEY (`hash`) PRIMARY KEY (`hash`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Version 1'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Version 1';