Thank you kindly, TLaukkan (Tommil) for a patch that:

* Created value object for EstateRegionLink for storing the estate region relationship. * Refactored slightly NHibernateManager and NHibernateXXXXData implementations for accesing nhibernate generated ID on insert. ** Changed NHibernateManager.Save method name to Insert as it does Insert. ** Changed NHibernateManager.Save return value object as ID can be both UUID and uint currently. ** Changed NHibernateManager.Load method Id parameter to object as it can be both UUID and uint. * Created NHibernateEstateData implementation. This is the actual estate storage. * Created NHibernate mapping files for both EstateSettings and EstateRegionLink * Created MigrationSyntaxDifferences.txt files to write notes about differences in migration scripts between different databases. * Created estate storage migration scripts for all four databases. * Created estate unit test classes for all four databases. * Updated one missing field to BasicEstateTest.cs * Tested NHibernate unit tests with NUnit GUI. Asset databases fail but that is not related to this patch. * Tested build with both Visual Studio and nant. * Executed build tests with nant succesfully.
author: Charles Krinke 2009-02-14 19:47:02 +0000
committer: Charles Krinke 2009-02-14 19:47:02 +0000
commit: a583d8ad70daad8c755c2f43e2f2af7bc5b7ee4d (patch)
tree: 7e90740b7ea86922db55905a34e3b6e065cb6041 /OpenSim/Data/NHibernate/NHibernateEstateData.cs
parent: Add an override for the % operator. (diff)
download: opensim-SC_OLD-a583d8ad70daad8c755c2f43e2f2af7bc5b7ee4d.zip
opensim-SC_OLD-a583d8ad70daad8c755c2f43e2f2af7bc5b7ee4d.tar.gz
opensim-SC_OLD-a583d8ad70daad8c755c2f43e2f2af7bc5b7ee4d.tar.bz2
opensim-SC_OLD-a583d8ad70daad8c755c2f43e2f2af7bc5b7ee4d.tar.xz
1 files changed, 161 insertions, 0 deletions
diff --git a/OpenSim/Data/NHibernate/NHibernateEstateData.cs b/OpenSim/Data/NHibernate/NHibernateEstateData.cs
new file mode 100644
index 0000000..59896dd
--- /dev/null
+++ b/OpenSim/Data/NHibernate/NHibernateEstateData.cs
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * 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
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+using System.Reflection;
+using log4net;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using NHibernate;
+using NHibernate.Criterion;
+using System.Collections;
+using System;
+namespace OpenSim.Data.NHibernate
+{
+    /// <summary>
+    /// A User storage interface for the DB4o database system
+    /// </summary>
+    public class NHibernateEstateData : IEstateDataStore
+    {
+        #region Fields
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        public NHibernateManager manager;
+        public string Name
+        {
+            get { return "NHibernateEstateData"; }
+        }
+        public string Version
+        {
+            get { return "0.1"; }
+        }
+        #endregion
+        #region Startup and shutdown.
+        public void Initialise()
+        {
+            m_log.Info("[NHIBERNATE]: " + Name + " cannot be default-initialized!");
+            throw new PluginNotInitialisedException(Name);
+        }
+        public void Initialise(string connect)
+        {
+            m_log.InfoFormat("[NHIBERNATE] Initializing " + Name + ".");
+            manager = new NHibernateManager(connect, "EstateStore");
+        }
+        public void Dispose() { }
+        #endregion
+        #region IEstateDataStore Members
+        public EstateSettings LoadEstateSettings(UUID regionID)
+        {
+            EstateRegionLink link = LoadEstateRegionLink(regionID);
+            // Ensure that estate settings exist for the link
+            if (link != null)
+            {
+                if (manager.Load(typeof(EstateSettings), link.EstateID) == null)
+                {
+                    // Delete broken link
+                    manager.Delete(link);
+                    link = null;
+                }
+            }
+            // If estate link does not exist create estate settings and link it to region.
+            if (link == null)
+            {
+                EstateSettings estateSettings = new EstateSettings();
+                //estateSettings.EstateOwner = UUID.Random();
+                //estateSettings.BlockDwell = false;
+                object identifier = manager.Insert(estateSettings);
+                if (identifier == null)
+                {
+                    // Saving failed. Error is logged in the manager.
+                    return null;
+                }
+                uint estateID = (uint)identifier;
+                link = new EstateRegionLink();
+                link.EstateRegionLinkID = UUID.Random();
+                link.RegionID = regionID;
+                link.EstateID = estateID;
+                manager.Insert(link);
+            }
+            // Load estate settings according to the existing or created link.
+            return (EstateSettings)manager.Load(typeof(EstateSettings), link.EstateID);
+        }
+        public void StoreEstateSettings(EstateSettings estateSettings)
+        {
+            // Estates are always updated when stored.
+            // Insert is always done via. load method as with the current API
+            // this is explicitly the only way to create region link.
+            manager.Update(estateSettings);
+        }
+        #endregion
+        #region Private Utility Methods
+        private EstateRegionLink LoadEstateRegionLink(UUID regionID)
+        {
+            ICriteria criteria = manager.GetSession().CreateCriteria(typeof(EstateRegionLink));
+            criteria.Add(Expression.Eq("RegionID", regionID));
+            IList links = criteria.List();
+            // Fail fast if more than one estate links exist
+            if (links.Count > 1)
+            {
+                m_log.Error("[NHIBERNATE]: Region had more than one estate linked: " + regionID);
+                throw new Exception("[NHIBERNATE]: Region had more than one estate linked: " + regionID);
+            }
+            if (links.Count == 1)
+            {
+                return (EstateRegionLink)links[0];
+            }
+            else
+            {
+                return null;
+            }
+        }
+        #endregion 
+    }
+}
author	Charles Krinke	2009-02-14 19:47:02 +0000
committer	Charles Krinke	2009-02-14 19:47:02 +0000
commit	a583d8ad70daad8c755c2f43e2f2af7bc5b7ee4d (patch)
tree	7e90740b7ea86922db55905a34e3b6e065cb6041 /OpenSim/Data/NHibernate/NHibernateEstateData.cs
parent	Add an override for the % operator. (diff)
download	opensim-SC_OLD-a583d8ad70daad8c755c2f43e2f2af7bc5b7ee4d.zip opensim-SC_OLD-a583d8ad70daad8c755c2f43e2f2af7bc5b7ee4d.tar.gz opensim-SC_OLD-a583d8ad70daad8c755c2f43e2f2af7bc5b7ee4d.tar.bz2 opensim-SC_OLD-a583d8ad70daad8c755c2f43e2f2af7bc5b7ee4d.tar.xz

diff --git a/OpenSim/Data/NHibernate/NHibernateEstateData.cs b/OpenSim/Data/NHibernate/NHibernateEstateData.cs new file mode 100644 index 0000000..59896dd --- /dev/null +++ b/OpenSim/Data/NHibernate/NHibernateEstateData.cs
@@ -0,0 +1,161 @@
	1	/*
	2	* Copyright (c) Contributors, http://opensimulator.org/
	3	* See CONTRIBUTORS.TXT for a full list of copyright holders.
	4	*
	5	* Redistribution and use in source and binary forms, with or without
	6	* modification, are permitted provided that the following conditions are met:
	7	* * Redistributions of source code must retain the above copyright
	8	* notice, this list of conditions and the following disclaimer.
	9	* * Redistributions in binary form must reproduce the above copyright
	10	* notice, this list of conditions and the following disclaimer in the
	11	* documentation and/or other materials provided with the distribution.
	12	* * Neither the name of the OpenSim Project nor the
	13	* names of its contributors may be used to endorse or promote products
	14	* derived from this software without specific prior written permission.
	15	*
	16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
	17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
	19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
	20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
	21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
	22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
	23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
	24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
	25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
	26	*/
	27
	28	using System.Reflection;
	29	using log4net;
	30	using OpenMetaverse;
	31	using OpenSim.Framework;
	32	using OpenSim.Region.Framework.Interfaces;
	33	using NHibernate;
	34	using NHibernate.Criterion;
	35	using System.Collections;
	36	using System;
	37
	38	namespace OpenSim.Data.NHibernate
	39	{
	40	/// <summary>
	41	/// A User storage interface for the DB4o database system
	42	/// </summary>
	43	public class NHibernateEstateData : IEstateDataStore
	44	{
	45
	46	#region Fields
	47
	48	private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
	49
	50	public NHibernateManager manager;
	51
	52	public string Name
	53	{
	54	get { return "NHibernateEstateData"; }
	55	}
	56
	57	public string Version
	58	{
	59	get { return "0.1"; }
	60	}
	61
	62	#endregion
	63
	64	#region Startup and shutdown.
	65
	66	public void Initialise()
	67	{
	68	m_log.Info("[NHIBERNATE]: " + Name + " cannot be default-initialized!");
	69	throw new PluginNotInitialisedException(Name);
	70	}
	71
	72	public void Initialise(string connect)
	73	{
	74
	75	m_log.InfoFormat("[NHIBERNATE] Initializing " + Name + ".");
	76	manager = new NHibernateManager(connect, "EstateStore");
	77	}
	78
	79	public void Dispose() { }
	80
	81	#endregion
	82
	83	#region IEstateDataStore Members
	84
	85	public EstateSettings LoadEstateSettings(UUID regionID)
	86	{
	87	EstateRegionLink link = LoadEstateRegionLink(regionID);
	88
	89	// Ensure that estate settings exist for the link
	90	if (link != null)
	91	{
	92	if (manager.Load(typeof(EstateSettings), link.EstateID) == null)
	93	{
	94	// Delete broken link
	95	manager.Delete(link);
	96	link = null;
	97	}
	98	}
	99
	100	// If estate link does not exist create estate settings and link it to region.
	101	if (link == null)
	102	{
	103	EstateSettings estateSettings = new EstateSettings();
	104	//estateSettings.EstateOwner = UUID.Random();
	105	//estateSettings.BlockDwell = false;
	106	object identifier = manager.Insert(estateSettings);
	107
	108	if (identifier == null)
	109	{
	110	// Saving failed. Error is logged in the manager.
	111	return null;
	112	}
	113
	114	uint estateID = (uint)identifier;
	115	link = new EstateRegionLink();
	116	link.EstateRegionLinkID = UUID.Random();
	117	link.RegionID = regionID;
	118	link.EstateID = estateID;
	119	manager.Insert(link);
	120	}
	121
	122	// Load estate settings according to the existing or created link.
	123	return (EstateSettings)manager.Load(typeof(EstateSettings), link.EstateID);
	124	}
	125
	126	public void StoreEstateSettings(EstateSettings estateSettings)
	127	{
	128	// Estates are always updated when stored.
	129	// Insert is always done via. load method as with the current API
	130	// this is explicitly the only way to create region link.
	131	manager.Update(estateSettings);
	132	}
	133
	134	#endregion
	135
	136	#region Private Utility Methods
	137	private EstateRegionLink LoadEstateRegionLink(UUID regionID)
	138	{
	139	ICriteria criteria = manager.GetSession().CreateCriteria(typeof(EstateRegionLink));
	140	criteria.Add(Expression.Eq("RegionID", regionID));
	141	IList links = criteria.List();
	142
	143	// Fail fast if more than one estate links exist
	144	if (links.Count > 1)
	145	{
	146	m_log.Error("[NHIBERNATE]: Region had more than one estate linked: " + regionID);
	147	throw new Exception("[NHIBERNATE]: Region had more than one estate linked: " + regionID);
	148	}
	149
	150	if (links.Count == 1)
	151	{
	152	return (EstateRegionLink)links[0];
	153	}
	154	else
	155	{
	156	return null;
	157	}
	158	}
	159	#endregion
	160	}
	161	}