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

added some debugging for tracing where asset code isn't working with sqlite

afrisby
Sean Dague 2007-09-10 13:34:20 +00:00
parent ffe9c9374a
commit a1be7f4be5
4 changed files with 328 additions and 305 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

597
OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
View File

@ -1,298 +1,299 @@
/* /*
* Copyright (c) Contributors, http://www.openmetaverse.org/ * Copyright (c) Contributors, http://www.openmetaverse.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the * * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
*/ */
using System; using System;
using System.IO; using System.IO;
using System.Threading; using System.Threading;
using System.Reflection; using System.Reflection;
using libsecondlife; using libsecondlife;
using Nini.Config; using Nini.Config;
using OpenSim.Framework.Console; using OpenSim.Framework.Console;
using OpenSim.Framework.Interfaces; using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types; using OpenSim.Framework.Types;
using OpenSim.Framework.Utilities; using OpenSim.Framework.Utilities;
namespace OpenSim.Framework.Communications.Caches namespace OpenSim.Framework.Communications.Caches
{ {
public class SQLAssetServer : IAssetServer public class SQLAssetServer : IAssetServer
{ {
private IAssetReceiver _receiver; private IAssetReceiver _receiver;
private BlockingQueue<ARequest> _assetRequests; private BlockingQueue<ARequest> _assetRequests;
private Thread _localAssetServerThread; private Thread _localAssetServerThread;
protected IAssetProvider m_plugin; protected IAssetProvider m_plugin;
public SQLAssetServer() public SQLAssetServer()
{ {
System.Console.WriteLine("Starting sqlite asset storage system"); System.Console.WriteLine("Starting sqlite asset storage system");
_assetRequests = new BlockingQueue<ARequest>(); _assetRequests = new BlockingQueue<ARequest>();
AddPlugin("OpenSim.Framework.Data.SQLite.dll"); AddPlugin("OpenSim.Framework.Data.SQLite.dll");
this.SetUpAssetDatabase(); this.SetUpAssetDatabase();
this._localAssetServerThread = new Thread(new ThreadStart(RunRequests)); this._localAssetServerThread = new Thread(new ThreadStart(RunRequests));
this._localAssetServerThread.IsBackground = true; this._localAssetServerThread.IsBackground = true;
this._localAssetServerThread.Start(); this._localAssetServerThread.Start();
} }
public void AddPlugin(string FileName) public void AddPlugin(string FileName)
{ {
//MainLog.Instance.Verbose("SQLAssetServer", "AssetStorage: Attempting to load " + FileName); //MainLog.Instance.Verbose("SQLAssetServer", "AssetStorage: Attempting to load " + FileName);
Assembly pluginAssembly = Assembly.LoadFrom(FileName); Assembly pluginAssembly = Assembly.LoadFrom(FileName);
foreach (Type pluginType in pluginAssembly.GetTypes()) foreach (Type pluginType in pluginAssembly.GetTypes())
{ {
if (!pluginType.IsAbstract) if (!pluginType.IsAbstract)
{ {
Type typeInterface = pluginType.GetInterface("IAssetProvider", true); Type typeInterface = pluginType.GetInterface("IAssetProvider", true);
if (typeInterface != null) if (typeInterface != null)
{ {
IAssetProvider plug = (IAssetProvider)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); IAssetProvider plug = (IAssetProvider)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
m_plugin = plug; m_plugin = plug;
m_plugin.Initialise("AssetStorage.db", ""); m_plugin.Initialise("AssetStorage.db", "");
//MainLog.Instance.Verbose("AssetStorage: Added IAssetProvider Interface"); //MainLog.Instance.Verbose("AssetStorage: Added IAssetProvider Interface");
} }
typeInterface = null; typeInterface = null;
} }
} }
pluginAssembly = null; pluginAssembly = null;
} }
public void SetReceiver(IAssetReceiver receiver) public void SetReceiver(IAssetReceiver receiver)
{ {
this._receiver = receiver; this._receiver = receiver;
} }
public void FetchAsset(LLUUID assetID, bool isTexture) public void FetchAsset(LLUUID assetID, bool isTexture)
{ {
ARequest req = new ARequest(); ARequest req = new ARequest();
req.AssetID = assetID; req.AssetID = assetID;
req.IsTexture = isTexture; req.IsTexture = isTexture;
this._assetRequests.Enqueue(req); this._assetRequests.Enqueue(req);
} }
public void UpdateAsset(AssetBase asset) public void UpdateAsset(AssetBase asset)
{ {
m_plugin.UpdateAsset(asset); m_plugin.UpdateAsset(asset);
m_plugin.CommitAssets(); m_plugin.CommitAssets();
} }
public void CreateAsset(AssetBase asset) public void CreateAsset(AssetBase asset)
{ {
m_plugin.CreateAsset(asset); m_plugin.CreateAsset(asset);
m_plugin.CommitAssets(); m_plugin.CommitAssets();
} }
public void SetServerInfo(string ServerUrl, string ServerKey) public void SetServerInfo(string ServerUrl, string ServerKey)
{ {
} }
public void Close() public void Close()
{ {
m_plugin.CommitAssets(); m_plugin.CommitAssets();
} }
private void RunRequests() private void RunRequests()
{ {
while (true) while (true)
{ {
ARequest req = this._assetRequests.Dequeue(); ARequest req = this._assetRequests.Dequeue();
m_plugin.FetchAsset(req.AssetID); MainLog.Instance.Verbose("Requesting asset: " + req.AssetID);
AssetBase asset = m_plugin.FetchAsset(req.AssetID); AssetBase asset = m_plugin.FetchAsset(req.AssetID);
if (asset != null) if (asset != null)
{ {
_receiver.AssetReceived(asset, req.IsTexture); _receiver.AssetReceived(asset, req.IsTexture);
} }
else else
{ {
_receiver.AssetNotFound(req.AssetID); _receiver.AssetNotFound(req.AssetID);
} }
} }
} }
private void SetUpAssetDatabase() private void SetUpAssetDatabase()
{ {
MainLog.Instance.Verbose("Setting up asset database"); MainLog.Instance.Verbose("Setting up asset database");
AssetBase Image = new AssetBase(); AssetBase Image = new AssetBase();
Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000001"); Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000001");
Image.Name = "Bricks"; Image.Name = "Bricks";
this.LoadAsset(Image, true, "bricks.jp2"); this.LoadAsset(Image, true, "bricks.jp2");
m_plugin.CreateAsset(Image); m_plugin.CreateAsset(Image);
Image = new AssetBase(); Image = new AssetBase();
Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000002"); Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000002");
Image.Name = "Plywood"; Image.Name = "Plywood";
this.LoadAsset(Image, true, "plywood.jp2"); this.LoadAsset(Image, true, "plywood.jp2");
m_plugin.CreateAsset(Image); m_plugin.CreateAsset(Image);
Image = new AssetBase(); Image = new AssetBase();
Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000003"); Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000003");
Image.Name = "Rocks"; Image.Name = "Rocks";
this.LoadAsset(Image, true, "rocks.jp2"); this.LoadAsset(Image, true, "rocks.jp2");
m_plugin.CreateAsset(Image); m_plugin.CreateAsset(Image);
Image = new AssetBase(); Image = new AssetBase();
Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000004"); Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000004");
Image.Name = "Granite"; Image.Name = "Granite";
this.LoadAsset(Image, true, "granite.jp2"); this.LoadAsset(Image, true, "granite.jp2");
m_plugin.CreateAsset(Image); m_plugin.CreateAsset(Image);
Image = new AssetBase(); Image = new AssetBase();
Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000005"); Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000005");
Image.Name = "Hardwood"; Image.Name = "Hardwood";
this.LoadAsset(Image, true, "hardwood.jp2"); this.LoadAsset(Image, true, "hardwood.jp2");
m_plugin.CreateAsset(Image); m_plugin.CreateAsset(Image);
Image = new AssetBase(); Image = new AssetBase();
Image.FullID = new LLUUID("00000000-0000-0000-5005-000000000005"); Image.FullID = new LLUUID("00000000-0000-0000-5005-000000000005");
Image.Name = "Prim Base Texture"; Image.Name = "Prim Base Texture";
this.LoadAsset(Image, true, "plywood.jp2"); this.LoadAsset(Image, true, "plywood.jp2");
m_plugin.CreateAsset(Image); m_plugin.CreateAsset(Image);
Image = new AssetBase(); Image = new AssetBase();
Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000006"); Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000006");
Image.Name = "Map Base Texture"; Image.Name = "Map Base Texture";
this.LoadAsset(Image, true, "map_base.jp2"); this.LoadAsset(Image, true, "map_base.jp2");
m_plugin.CreateAsset(Image); m_plugin.CreateAsset(Image);
Image = new AssetBase(); Image = new AssetBase();
Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000007"); Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000007");
Image.Name = "Map Texture"; Image.Name = "Map Texture";
this.LoadAsset(Image, true, "map1.jp2"); this.LoadAsset(Image, true, "map1.jp2");
m_plugin.CreateAsset(Image); m_plugin.CreateAsset(Image);
Image = new AssetBase(); Image = new AssetBase();
Image.FullID = new LLUUID("00000000-0000-1111-9999-000000000010"); Image.FullID = new LLUUID("00000000-0000-1111-9999-000000000010");
Image.Name = "Female Body Texture"; Image.Name = "Female Body Texture";
this.LoadAsset(Image, true, "femalebody.jp2"); this.LoadAsset(Image, true, "femalebody.jp2");
m_plugin.CreateAsset(Image); m_plugin.CreateAsset(Image);
Image = new AssetBase(); Image = new AssetBase();
Image.FullID = new LLUUID("00000000-0000-1111-9999-000000000011"); Image.FullID = new LLUUID("00000000-0000-1111-9999-000000000011");
Image.Name = "Female Bottom Texture"; Image.Name = "Female Bottom Texture";
this.LoadAsset(Image, true, "femalebottom.jp2"); this.LoadAsset(Image, true, "femalebottom.jp2");
m_plugin.CreateAsset(Image); m_plugin.CreateAsset(Image);
Image = new AssetBase(); Image = new AssetBase();
Image.FullID = new LLUUID("00000000-0000-1111-9999-000000000012"); Image.FullID = new LLUUID("00000000-0000-1111-9999-000000000012");
Image.Name = "Female Face Texture"; Image.Name = "Female Face Texture";
this.LoadAsset(Image, true, "femaleface.jp2"); this.LoadAsset(Image, true, "femaleface.jp2");
m_plugin.CreateAsset(Image); m_plugin.CreateAsset(Image);
Image = new AssetBase(); Image = new AssetBase();
Image.FullID = new LLUUID("77c41e39-38f9-f75a-024e-585989bbabbb"); Image.FullID = new LLUUID("77c41e39-38f9-f75a-024e-585989bbabbb");
Image.Name = "Skin"; Image.Name = "Skin";
Image.Type = 13; Image.Type = 13;
Image.InvType = 13; Image.InvType = 13;
this.LoadAsset(Image, false, "base_skin.dat"); this.LoadAsset(Image, false, "base_skin.dat");
m_plugin.CreateAsset(Image); m_plugin.CreateAsset(Image);
Image = new AssetBase(); Image = new AssetBase();
Image.FullID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73"); Image.FullID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");
Image.Name = "Shape"; Image.Name = "Shape";
Image.Type = 13; Image.Type = 13;
Image.InvType = 13; Image.InvType = 13;
this.LoadAsset(Image, false, "base_shape.dat"); this.LoadAsset(Image, false, "base_shape.dat");
m_plugin.CreateAsset(Image); m_plugin.CreateAsset(Image);
Image = new AssetBase(); Image = new AssetBase();
Image.FullID = new LLUUID("00000000-38f9-1111-024e-222222111110"); Image.FullID = new LLUUID("00000000-38f9-1111-024e-222222111110");
Image.Name = "Shirt"; Image.Name = "Shirt";
Image.Type = 5; Image.Type = 5;
Image.InvType = 18; Image.InvType = 18;
this.LoadAsset(Image, false, "newshirt.dat"); this.LoadAsset(Image, false, "newshirt.dat");
m_plugin.CreateAsset(Image); m_plugin.CreateAsset(Image);
Image = new AssetBase(); Image = new AssetBase();
Image.FullID = new LLUUID("00000000-38f9-1111-024e-222222111120"); Image.FullID = new LLUUID("00000000-38f9-1111-024e-222222111120");
Image.Name = "Shirt"; Image.Name = "Shirt";
Image.Type = 5; Image.Type = 5;
Image.InvType = 18; Image.InvType = 18;
this.LoadAsset(Image, false, "newpants.dat"); this.LoadAsset(Image, false, "newpants.dat");
m_plugin.CreateAsset(Image); m_plugin.CreateAsset(Image);
string filePath = Path.Combine(Util.configDir(), "OpenSimAssetSet.xml"); string filePath = Path.Combine(Util.configDir(), "OpenSimAssetSet.xml");
if (File.Exists(filePath)) if (File.Exists(filePath))
{ {
XmlConfigSource source = new XmlConfigSource(filePath); XmlConfigSource source = new XmlConfigSource(filePath);
ReadAssetDetails(source); ReadAssetDetails(source);
} }
m_plugin.CommitAssets(); m_plugin.CommitAssets();
} }
protected void ReadAssetDetails(IConfigSource source) protected void ReadAssetDetails(IConfigSource source)
{ {
AssetBase newAsset = null; AssetBase newAsset = null;
for (int i = 0; i < source.Configs.Count; i++) for (int i = 0; i < source.Configs.Count; i++)
{ {
newAsset = new AssetBase(); newAsset = new AssetBase();
newAsset.FullID = new LLUUID(source.Configs[i].GetString("assetID", LLUUID.Random().ToStringHyphenated())); newAsset.FullID = new LLUUID(source.Configs[i].GetString("assetID", LLUUID.Random().ToStringHyphenated()));
newAsset.Name = source.Configs[i].GetString("name", ""); newAsset.Name = source.Configs[i].GetString("name", "");
newAsset.Type = (sbyte)source.Configs[i].GetInt("assetType", 0); newAsset.Type = (sbyte)source.Configs[i].GetInt("assetType", 0);
newAsset.InvType = (sbyte)source.Configs[i].GetInt("inventoryType", 0); newAsset.InvType = (sbyte)source.Configs[i].GetInt("inventoryType", 0);
string fileName = source.Configs[i].GetString("fileName", ""); string fileName = source.Configs[i].GetString("fileName", "");
if (fileName != "") if (fileName != "")
{ {
this.LoadAsset(newAsset, false, fileName); MainLog.Instance.Verbose("Creating new asset: " + newAsset.Name);
m_plugin.CreateAsset(newAsset); this.LoadAsset(newAsset, false, fileName);
} m_plugin.CreateAsset(newAsset);
} }
} }
}
private void LoadAsset(AssetBase info, bool image, string filename)
{ private void LoadAsset(AssetBase info, bool image, string filename)
//should request Asset from storage manager {
//but for now read from file //should request Asset from storage manager
//but for now read from file
string dataPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "assets"); //+ folder;
string fileName = Path.Combine(dataPath, filename); string dataPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "assets"); //+ folder;
FileInfo fInfo = new FileInfo(fileName); string fileName = Path.Combine(dataPath, filename);
long numBytes = fInfo.Length; FileInfo fInfo = new FileInfo(fileName);
FileStream fStream = new FileStream(fileName, FileMode.Open, FileAccess.Read); long numBytes = fInfo.Length;
byte[] idata = new byte[numBytes]; FileStream fStream = new FileStream(fileName, FileMode.Open, FileAccess.Read);
BinaryReader br = new BinaryReader(fStream); byte[] idata = new byte[numBytes];
idata = br.ReadBytes((int)numBytes); BinaryReader br = new BinaryReader(fStream);
br.Close(); idata = br.ReadBytes((int)numBytes);
fStream.Close(); br.Close();
info.Data = idata; fStream.Close();
//info.loaded=true; info.Data = idata;
} //info.loaded=true;
} }
}
}
}

21
OpenSim/Framework/Data.SQLite/SQLiteAssetData.cs
View File

@ -100,6 +100,15 @@ namespace OpenSim.Framework.Data.SQLite
public void UpdateAsset(AssetBase asset) public void UpdateAsset(AssetBase asset)
{ {
MainLog.Instance.Verbose("AssetStorage",
"Asset: " + asset.FullID +
", Name: " + asset.Name +
", Description: " + asset.Description +
", Type: " + asset.Type +
", InvType: " + asset.InvType +
", Temporary: " + asset.Temporary +
", Local: " + asset.Local +
", Data Length: " + asset.Data.Length );
DataTable assets = ds.Tables["assets"]; DataTable assets = ds.Tables["assets"];
DataRow row = assets.Rows.Find(asset.FullID); DataRow row = assets.Rows.Find(asset.FullID);
if (row == null) if (row == null)
@ -112,6 +121,11 @@ namespace OpenSim.Framework.Data.SQLite
{ {
fillAssetRow(row, asset); fillAssetRow(row, asset);
} }
if (ds.HasChanges()) {
DataSet changed = ds.GetChanges();
da.Update(changed, "assets");
ds.AcceptChanges();
}
} }
public bool ExistsAsset(LLUUID uuid) public bool ExistsAsset(LLUUID uuid)
@ -122,7 +136,12 @@ namespace OpenSim.Framework.Data.SQLite
public void CommitAssets() // force a sync to the database public void CommitAssets() // force a sync to the database
{ {
da.Update(ds, "assets"); MainLog.Instance.Verbose("AssetStorage", "Attempting commit");
if (ds.HasChanges()) {
DataSet changed = ds.GetChanges();
da.Update(changed, "assets");
ds.AcceptChanges();
}
} }
/*********************************************************************** /***********************************************************************

4
OpenSim/Framework/Data.SQLite/SQLiteBase.cs
View File

@ -197,6 +197,8 @@ namespace OpenSim.Framework.Data.SQLite
return DbType.UInt64; return DbType.UInt64;
} else if (type == typeof(System.Double)) { } else if (type == typeof(System.Double)) {
return DbType.Double; return DbType.Double;
} else if (type == typeof(System.Boolean)) {
return DbType.Boolean;
} else if (type == typeof(System.Byte[])) { } else if (type == typeof(System.Byte[])) {
return DbType.Binary; return DbType.Binary;
} else { } else {
@ -220,6 +222,8 @@ namespace OpenSim.Framework.Data.SQLite
return "varchar(255)"; return "varchar(255)";
} else if (type == typeof(System.Double)) { } else if (type == typeof(System.Double)) {
return "float"; return "float";
} else if (type == typeof(System.Boolean)) {
return "integer";
} else if (type == typeof(System.Byte[])) { } else if (type == typeof(System.Byte[])) {
return "blob"; return "blob";
} else { } else {

11
OpenSim/Framework/General/Types/AssetBase.cs
View File

@ -35,15 +35,14 @@ namespace OpenSim.Framework.Types
public LLUUID FullID; public LLUUID FullID;
public sbyte Type; public sbyte Type;
public sbyte InvType; public sbyte InvType;
public string Name; public string Name = "";
public string Description; public string Description = "";
public bool Local; public bool Local = false;
public bool Temporary; public bool Temporary = false;
public AssetBase() public AssetBase()
{ {
Name = " ";
Description = " ";
} }
} }
} }