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

Fix some errors in PgSQL XAssets by changing some data types. Also make sql query syntax more in line with the PgSQL AssetData implementation.

mb-throttle-test
BlueWall 2014-10-10 19:24:46 -04:00
parent 00b23e51ae
commit 7af878a4f4
2 changed files with 58 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
OpenSim/Data/PGSQL/PGSQLXAssetData.cs
View File

@ -56,6 +56,7 @@ namespace OpenSim.Data.PGSQL
private const int DaysBetweenAccessTimeUpdates = 30; private const int DaysBetweenAccessTimeUpdates = 30;
private bool m_enableCompression = false; private bool m_enableCompression = false;
private PGSQLManager m_database;
private string m_connectionString; private string m_connectionString;
private object m_dbLock = new object(); private object m_dbLock = new object();
@ -92,6 +93,7 @@ namespace OpenSim.Data.PGSQL
m_log.ErrorFormat("[PGSQL XASSETDATA]: ***********************************************************"); m_log.ErrorFormat("[PGSQL XASSETDATA]: ***********************************************************");
m_connectionString = connect; m_connectionString = connect;
m_database = new PGSQLManager(m_connectionString);
using (NpgsqlConnection dbcon = new NpgsqlConnection(m_connectionString)) using (NpgsqlConnection dbcon = new NpgsqlConnection(m_connectionString))
{ {
@ -151,7 +153,12 @@ namespace OpenSim.Data.PGSQL
{ {
if (dbReader.Read()) if (dbReader.Read())
{ {
asset = new AssetBase(assetID, (string)dbReader["Name"], (sbyte)dbReader["AssetType"], dbReader["CreatorID"].ToString()); asset = new AssetBase(
assetID,
(string)dbReader["Name"],
Convert.ToSByte(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"];
@ -249,17 +256,19 @@ namespace OpenSim.Data.PGSQL
// "[XASSET DB]: Compressed data size for {0} {1}, hash {2} is {3}", // "[XASSET DB]: Compressed data size for {0} {1}, hash {2} is {3}",
// asset.ID, asset.Name, hash, compressedData.Length); // asset.ID, asset.Name, hash, compressedData.Length);
m_log.DebugFormat("[XASSET DB]: Hash Info {0} {1}", hash, hash.Length);
try try
{ {
using (NpgsqlCommand cmd = using (NpgsqlCommand cmd =
new NpgsqlCommand( new NpgsqlCommand(
@"insert INTO XAssetsMeta(""ID"", ""Hash"", ""Name"", ""Description"", ""AssetType"", ""Local"", ""Temporary"", ""CreateTime"", ""AccessTime"", ""AssetFlags"", ""CreatorID"") @"insert INTO XAssetsMeta(""ID"", ""Hash"", ""Name"", ""Description"", " + " \"AssetType\" " + @", ""Local"", ""Temporary"", ""CreateTime"", ""AccessTime"", ""AssetFlags"", ""CreatorID"")
Select :ID, :Hash, :Name, :Description, :AssetType, :Local, :Temporary, :CreateTime, :AccessTime, :AssetFlags, :CreatorID Select :ID, :Hash, :Name, :Description, :AssetType, :Local, :Temporary, :CreateTime, :AccessTime, :AssetFlags, :CreatorID
where not exists( Select ""ID"" from XAssetsMeta where ""ID"" = :ID ; where not exists( Select ""ID"" from XAssetsMeta where ""ID"" = :ID);
update XAssetsMeta update XAssetsMeta
set ""ID"" = :ID, ""Hash"" = :Hash, ""Name"" = :Name, ""Description"" = :Description, set ""ID"" = :ID, ""Hash"" = :Hash, ""Name"" = :Name, ""Description"" = :Description, " +
""AssetType"" = :AssetType, ""Local"" = :Local, ""Temporary"" = :Temporary, ""CreateTime"" = :CreateTime, "\"AssetType\" " + @" = :AssetType, ""Local"" = :Local, ""Temporary"" = :Temporary, ""CreateTime"" = :CreateTime,
""AccessTime"" = :AccessTime, ""AssetFlags"" = :AssetFlags, ""CreatorID"" = :CreatorID ""AccessTime"" = :AccessTime, ""AssetFlags"" = :AssetFlags, ""CreatorID"" = :CreatorID
where ""ID"" = :ID; where ""ID"" = :ID;
", ",
@ -267,17 +276,29 @@ namespace OpenSim.Data.PGSQL
{ {
// 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.Add(m_database.CreateParameter("ID", asset.ID));
cmd.Parameters.AddWithValue("Hash", hash); // cmd.Parameters.AddWithValue("ID", asset.ID);
cmd.Parameters.AddWithValue("Name", assetName); cmd.Parameters.Add(m_database.CreateParameter("Hash", hash));
cmd.Parameters.AddWithValue("Description", assetDescription); // cmd.Parameters.AddWithValue("Hash", hash);
cmd.Parameters.AddWithValue("AssetType", asset.Type); cmd.Parameters.Add(m_database.CreateParameter("Name", assetName));
cmd.Parameters.AddWithValue("Local", asset.Local); // cmd.Parameters.AddWithValue("Name", assetName);
cmd.Parameters.AddWithValue("Temporary", asset.Temporary); cmd.Parameters.Add(m_database.CreateParameter("Description", assetDescription));
cmd.Parameters.AddWithValue("CreateTime", now); // cmd.Parameters.AddWithValue("Description", assetDescription);
cmd.Parameters.AddWithValue("AccessTime", now); cmd.Parameters.Add(m_database.CreateParameter("AssetType", asset.Type));
cmd.Parameters.AddWithValue("CreatorID", asset.Metadata.CreatorID); // cmd.Parameters.AddWithValue("AssetType", asset.Type);
cmd.Parameters.AddWithValue("AssetFlags", (int)asset.Flags); cmd.Parameters.Add(m_database.CreateParameter("Local", asset.Local));
// cmd.Parameters.AddWithValue("Local", asset.Local);
cmd.Parameters.Add(m_database.CreateParameter("Temporary", asset.Temporary));
// cmd.Parameters.AddWithValue("Temporary", asset.Temporary);
cmd.Parameters.Add(m_database.CreateParameter("CreateTime", now));
// cmd.Parameters.AddWithValue("CreateTime", now);
cmd.Parameters.Add(m_database.CreateParameter("AccessTime", now));
// cmd.Parameters.AddWithValue("AccessTime", now);
cmd.Parameters.Add(m_database.CreateParameter("CreatorID", asset.Metadata.CreatorID));
// cmd.Parameters.AddWithValue("CreatorID", asset.Metadata.CreatorID);
cmd.Parameters.Add(m_database.CreateParameter("AssetFlags", (int)asset.Flags));
// cmd.Parameters.AddWithValue("AssetFlags", (int)asset.Flags);
cmd.ExecuteNonQuery(); cmd.ExecuteNonQuery();
} }
} }
@ -300,8 +321,10 @@ namespace OpenSim.Data.PGSQL
@"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.Add(m_database.CreateParameter("Hash", hash));
cmd.Parameters.AddWithValue("Data", asset.Data); // cmd.Parameters.AddWithValue("Hash", hash);
cmd.Parameters.Add(m_database.CreateParameter("Data", asset.Data));
// cmd.Parameters.AddWithValue("Data", asset.Data);
cmd.ExecuteNonQuery(); cmd.ExecuteNonQuery();
} }
} }
@ -351,8 +374,10 @@ namespace OpenSim.Data.PGSQL
using (cmd) using (cmd)
{ {
// create unix epoch time // create unix epoch time
cmd.Parameters.AddWithValue("ID", assetMetadata.ID); cmd.Parameters.Add(m_database.CreateParameter("ID", assetMetadata.ID));
cmd.Parameters.AddWithValue("AccessTime", (int)Utils.DateTimeToUnixTime(now)); // cmd.Parameters.AddWithValue("ID", assetMetadata.ID);
cmd.Parameters.Add(m_database.CreateParameter("AccessTime", (int)Utils.DateTimeToUnixTime(now)));
// cmd.Parameters.AddWithValue("AccessTime", (int)Utils.DateTimeToUnixTime(now));
cmd.ExecuteNonQuery(); cmd.ExecuteNonQuery();
} }
} }
@ -518,7 +543,7 @@ namespace OpenSim.Data.PGSQL
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["AssetType"]; metadata.Type = Convert.ToSByte(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["AssetFlags"]); metadata.Flags = (AssetFlags)Convert.ToInt32(dbReader["AssetFlags"]);
metadata.FullID = DBGuid.FromDB(dbReader["ID"]); metadata.FullID = DBGuid.FromDB(dbReader["ID"]);

12
OpenSim/Data/PGSQL/Resources/XAssetStore.migrations
View File

@ -25,3 +25,15 @@ CREATE TABLE XAssetsData (
); );
COMMIT; COMMIT;
:VERSION 2
BEGIN;
ALTER TABLE xassetsmeta ALTER COLUMN "Local" SET DATA TYPE boolean USING CASE WHEN '0' THEN FALSE ELSE TRUE END;
ALTER TABLE xassetsmeta ALTER COLUMN "Temporary" SET DATA TYPE boolean USING CASE WHEN '0' THEN FALSE ELSE TRUE END;
ALTER TABLE xassetsmeta ALTER COLUMN "Hash" SET DATA TYPE char(66);
ALTER TABLE xassetsdata ALTER COLUMN "Hash" SET DATA TYPE char(66);
COMMIT;