diff options
author | Diva Canto | 2013-02-19 06:37:20 -0800 |
---|---|---|
committer | Diva Canto | 2013-02-19 06:37:20 -0800 |
commit | 46e182dbf546dcb58d088c043a0baa2dcfed9125 (patch) | |
tree | a3093e7ddb69c45d876229a430e22cda4f4699b4 /OpenSim/Addons | |
parent | One more sql statement on migration #2 for offline im, to really clean up thi... (diff) | |
download | opensim-SC-46e182dbf546dcb58d088c043a0baa2dcfed9125.zip opensim-SC-46e182dbf546dcb58d088c043a0baa2dcfed9125.tar.gz opensim-SC-46e182dbf546dcb58d088c043a0baa2dcfed9125.tar.bz2 opensim-SC-46e182dbf546dcb58d088c043a0baa2dcfed9125.tar.xz |
Offline IM: moved the Data and MySQL bits to the corresponding places in core, so that it will be easier to plugin a SQLite backend, if anyone is interested in doing that.
Diffstat (limited to 'OpenSim/Addons')
-rw-r--r-- | OpenSim/Addons/OfflineIM/Data/IOfflineIMData.cs | 49 | ||||
-rw-r--r-- | OpenSim/Addons/OfflineIM/Data/MySQLOfflineIMData.cs | 68 | ||||
-rw-r--r-- | OpenSim/Addons/OfflineIM/Resources/IM_Store.migrations | 24 |
3 files changed, 0 insertions, 141 deletions
diff --git a/OpenSim/Addons/OfflineIM/Data/IOfflineIMData.cs b/OpenSim/Addons/OfflineIM/Data/IOfflineIMData.cs deleted file mode 100644 index a507f7d..0000000 --- a/OpenSim/Addons/OfflineIM/Data/IOfflineIMData.cs +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
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 OpenSimulator 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.Collections.Generic; | ||
29 | using OpenSim.Data; | ||
30 | using OpenMetaverse; | ||
31 | |||
32 | namespace OpenSim.OfflineIM | ||
33 | { | ||
34 | public class OfflineIMData | ||
35 | { | ||
36 | public UUID PrincipalID; | ||
37 | public Dictionary<string, string> Data; | ||
38 | } | ||
39 | |||
40 | |||
41 | public interface IOfflineIMData | ||
42 | { | ||
43 | OfflineIMData[] Get(string field, string val); | ||
44 | long GetCount(string field, string key); | ||
45 | bool Store(OfflineIMData data); | ||
46 | bool Delete(string field, string val); | ||
47 | void DeleteOld(); | ||
48 | } | ||
49 | } | ||
diff --git a/OpenSim/Addons/OfflineIM/Data/MySQLOfflineIMData.cs b/OpenSim/Addons/OfflineIM/Data/MySQLOfflineIMData.cs deleted file mode 100644 index 0a61cd2..0000000 --- a/OpenSim/Addons/OfflineIM/Data/MySQLOfflineIMData.cs +++ /dev/null | |||
@@ -1,68 +0,0 @@ | |||
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 OpenSimulator 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; | ||
29 | using System.Collections; | ||
30 | using System.Collections.Generic; | ||
31 | using System.Reflection; | ||
32 | |||
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Data.MySQL; | ||
35 | |||
36 | using OpenMetaverse; | ||
37 | using MySql.Data.MySqlClient; | ||
38 | |||
39 | namespace OpenSim.OfflineIM | ||
40 | { | ||
41 | public class MySQLOfflineIMData : MySQLGenericTableHandler<OfflineIMData>, IOfflineIMData | ||
42 | { | ||
43 | protected override Assembly Assembly | ||
44 | { | ||
45 | // WARNING! Moving migrations to this assembly!!! | ||
46 | get { return GetType().Assembly; } | ||
47 | } | ||
48 | |||
49 | public MySQLOfflineIMData(string connectionString, string realm) | ||
50 | : base(connectionString, realm, "IM_Store") | ||
51 | { | ||
52 | } | ||
53 | |||
54 | public void DeleteOld() | ||
55 | { | ||
56 | uint now = (uint)Util.UnixTimeSinceEpoch(); | ||
57 | |||
58 | using (MySqlCommand cmd = new MySqlCommand()) | ||
59 | { | ||
60 | cmd.CommandText = String.Format("delete from {0} where TMStamp < ?tstamp", m_Realm); | ||
61 | cmd.Parameters.AddWithValue("?tstamp", now - 14 * 24 * 60 * 60); // > 2 weeks old | ||
62 | |||
63 | ExecuteNonQuery(cmd); | ||
64 | } | ||
65 | |||
66 | } | ||
67 | } | ||
68 | } | ||
diff --git a/OpenSim/Addons/OfflineIM/Resources/IM_Store.migrations b/OpenSim/Addons/OfflineIM/Resources/IM_Store.migrations deleted file mode 100644 index 7cfcd43..0000000 --- a/OpenSim/Addons/OfflineIM/Resources/IM_Store.migrations +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | :VERSION 1 # -------------------------- | ||
2 | |||
3 | BEGIN; | ||
4 | |||
5 | CREATE TABLE `im_offline` ( | ||
6 | `ID` MEDIUMINT NOT NULL AUTO_INCREMENT, | ||
7 | `PrincipalID` char(36) NOT NULL default '', | ||
8 | `Message` text NOT NULL, | ||
9 | `TMStamp` timestamp NOT NULL, | ||
10 | PRIMARY KEY (`ID`), | ||
11 | KEY `PrincipalID` (`PrincipalID`) | ||
12 | ) ENGINE=MyISAM; | ||
13 | |||
14 | COMMIT; | ||
15 | |||
16 | :VERSION 2 # -------------------------- | ||
17 | |||
18 | BEGIN; | ||
19 | |||
20 | INSERT INTO `im_offline` SELECT * from `diva_im_offline`; | ||
21 | DROP TABLE `diva_im_offline`; | ||
22 | DELETE FROM `migrations` WHERE name='diva_im_Store'; | ||
23 | |||
24 | COMMIT; \ No newline at end of file | ||