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

Touchup PgSQL XAssets adapter

mb-throttle-test
BlueWall 2014-10-15 17:28:51 -04:00
parent b45c929d66
commit 8a93d97320
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,7 +145,7 @@ namespace OpenSim.Data.PGSQL
JOIN XAssetsData ON XAssetsMeta.hash = XAssetsData.Hash WHERE id=:ID", JOIN XAssetsData ON XAssetsMeta.hash = XAssetsData.Hash WHERE id=:ID",
dbcon)) dbcon))
{ {
cmd.Parameters.AddWithValue("ID", assetID.ToString()); cmd.Parameters.Add(m_database.CreateParameter("ID", assetID));
try try
{ {
@ -252,6 +252,9 @@ namespace OpenSim.Data.PGSQL
byte[] hash = hasher.ComputeHash(asset.Data); byte[] hash = hasher.ComputeHash(asset.Data);
UUID asset_id;
UUID.TryParse(asset.ID, out asset_id);
// m_log.DebugFormat( // m_log.DebugFormat(
// "[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);
@ -260,21 +263,22 @@ namespace OpenSim.Data.PGSQL
{ {
using (NpgsqlCommand cmd = using (NpgsqlCommand cmd =
new NpgsqlCommand( new NpgsqlCommand(
@"insert INTO XAssetsMeta(id, hash, name, description, " + " \"AssetType\" " + @", local, temporary, create_time, access_time, asset_flags, creatorid) @"insert INTO XAssetsMeta(id, hash, name, description, ""AssetType"", local, temporary, create_time, access_time, asset_flags, 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, create_time = :CreateTime, ""AssetType"" = :AssetType, local = :Local, temporary = :Temporary, create_time = :CreateTime,
access_time = :AccessTime, asset_flags = :AssetFlags, creatorid = :CreatorID access_time = :AccessTime, asset_flags = :AssetFlags, creatorid = :CreatorID
where id = :ID; where id = :ID;
", ",
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.Add(m_database.CreateParameter("ID", asset.ID)); cmd.Parameters.Add(m_database.CreateParameter("ID", asset_id));
cmd.Parameters.Add(m_database.CreateParameter("Hash", hash)); cmd.Parameters.Add(m_database.CreateParameter("Hash", hash));
cmd.Parameters.Add(m_database.CreateParameter("Name", assetName)); cmd.Parameters.Add(m_database.CreateParameter("Name", assetName));
cmd.Parameters.Add(m_database.CreateParameter("Description", assetDescription)); cmd.Parameters.Add(m_database.CreateParameter("Description", assetDescription));
@ -356,10 +360,13 @@ namespace OpenSim.Data.PGSQL
try try
{ {
UUID asset_id;
UUID.TryParse(assetMetadata.ID, out asset_id);
using (cmd) using (cmd)
{ {
// create unix epoch time // create unix epoch time
cmd.Parameters.Add(m_database.CreateParameter("id", assetMetadata.ID)); cmd.Parameters.Add(m_database.CreateParameter("id", asset_id));
cmd.Parameters.Add(m_database.CreateParameter("access_time", (int)Utils.DateTimeToUnixTime(now))); cmd.Parameters.Add(m_database.CreateParameter("access_time", (int)Utils.DateTimeToUnixTime(now)));
cmd.ExecuteNonQuery(); cmd.ExecuteNonQuery();
} }
@ -390,7 +397,7 @@ namespace OpenSim.Data.PGSQL
using (NpgsqlCommand cmd = new NpgsqlCommand(@"SELECT hash FROM XAssetsData WHERE hash=:Hash", dbcon)) using (NpgsqlCommand cmd = new NpgsqlCommand(@"SELECT hash FROM XAssetsData WHERE hash=:Hash", dbcon))
{ {
cmd.Parameters.AddWithValue("hash", hash); cmd.Parameters.Add(m_database.CreateParameter("Hash", hash));
try try
{ {
@ -469,7 +476,7 @@ namespace OpenSim.Data.PGSQL
dbcon.Open(); dbcon.Open();
using (NpgsqlCommand cmd = new NpgsqlCommand(@"SELECT id FROM XAssetsMeta WHERE id=:ID", dbcon)) using (NpgsqlCommand cmd = new NpgsqlCommand(@"SELECT id FROM XAssetsMeta WHERE id=:ID", dbcon))
{ {
cmd.Parameters.AddWithValue("id", uuid.ToString()); cmd.Parameters.Add(m_database.CreateParameter("id", uuid));
try try
{ {
@ -514,8 +521,8 @@ namespace OpenSim.Data.PGSQL
NpgsqlCommand cmd = new NpgsqlCommand( @"SELECT name, description, access_time, ""AssetType"", temporary, id, asset_flags, creatorid NpgsqlCommand cmd = new NpgsqlCommand( @"SELECT name, description, access_time, ""AssetType"", temporary, id, asset_flags, creatorid
FROM XAssetsMeta FROM XAssetsMeta
LIMIT :start, :count", dbcon); LIMIT :start, :count", dbcon);
cmd.Parameters.AddWithValue("start", start); cmd.Parameters.Add(m_database.CreateParameter("start", start));
cmd.Parameters.AddWithValue("count", count); cmd.Parameters.Add(m_database.CreateParameter("count", count));
try try
{ {
@ -563,7 +570,7 @@ namespace OpenSim.Data.PGSQL
using (NpgsqlCommand cmd = new NpgsqlCommand(@"delete from XAssetsMeta where id=:ID", dbcon)) using (NpgsqlCommand cmd = new NpgsqlCommand(@"delete from XAssetsMeta where id=:ID", dbcon))
{ {
cmd.Parameters.AddWithValue(id, id); cmd.Parameters.Add(m_database.CreateParameter(id, id));
cmd.ExecuteNonQuery(); cmd.ExecuteNonQuery();
} }

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

@ -82,3 +82,13 @@ ALTER TABLE xassetsdata ADD COLUMN hash bytea NOT NULL;
ALTER TABLE xassetsdata ADD PRIMARY KEY (hash); ALTER TABLE xassetsdata ADD PRIMARY KEY (hash);
COMMIT; COMMIT;
:VERSION 5
BEGIN;
ALTER TABLE xassetsmeta ALTER COLUMN id SET DATA TYPE uuid USING id::uuid;
ALTER TABLE xassetsmeta ALTER COLUMN hash SET DATA TYPE bytea USING hash::bytea;
ALTER TABLE xassetsdata ALTER COLUMN hash SET DATA TYPE bytea USING hash::bytea;
COMMIT;