Commit Graph

255 Commits (f18b80741ae7e83073b635cf91843d3563cc66e9)

Author SHA1 Message Date
Jeff Ames d470d30c09 Copyright notices and formatting cleanup. 2008-07-06 14:02:22 +00:00
Charles Krinke 7fea52be35 Mantis#1661. Thank you kindly, CMickeyb for a patch that:
patch attached to check for timeouts on mysql connections *before* 
operations occur that are likely to timeout. if timeout occurs or 
the connections is down, it is reconnected before the operation fails.
2008-07-03 22:30:16 +00:00
Sean Dague a9b3c2582a add 3 migrations, 1 each for prims, primshapes, and primitems
to move all their UUID stores from varchar(255) -> char(36).  Based
on past evidence, this should help with performance.
2008-07-03 19:41:01 +00:00
Sean Dague 8eb57b68f3 migrate the myisam mysql regions to innodb 2008-07-03 18:45:32 +00:00
Sean Dague f0f1e00ec3 add a couple of LL conversion properties to SOP. I'll wait to clean
up the sit target usage until the sit target fix patch goes in, but it should
be cleaned.
Get prims table mappings to the point where nhibernate likes them enough
to start.
Remove field from asset mapping so it will start
2008-07-03 18:25:18 +00:00
Sean Dague b9bba13c39 playing with multicolumn mapping of vectors using a custom type 2008-07-03 16:37:44 +00:00
Jeff Ames fde6983cce Update svn properties. 2008-07-03 03:01:02 +00:00
Justin Clarke Casey 9052c43319 * Drop InvType from the assets table since it is no longer used
* Migration should be automatic on sqlite and mysql
* Migration is not automatic on mssql, you will need to drop the invType column manually
* Migration should be fine, but as for any db change, I would recommend making sure you have backups before moving past this revision
2008-07-02 16:20:54 +00:00
Charles Krinke bf34f65125 Mantis#1639. Thank you, Melanie for a patch that:
Reads estate_settings.xml and populates the database from it. 
If there is no record, just passes the defaults to the application.
2008-07-01 02:16:58 +00:00
Charles Krinke 4cb42d4c35 Mantis#1637. Thank you kindly, Melanie for a patch that:
Make each region load it's settings from the database on startup. 
No user functionality yet.
2008-06-30 14:09:19 +00:00
Justin Clarke Casey 31c63558c8 * Fix for http://opensimulator.org/mantis/view.php?id=1512
* Introduce experimental wait timeout checking to mysql region datastore code 
* This should mean that if the mysql connection has timed out, we should automatically reconnect and not fail or drop queries on region database manipulations
2008-06-29 18:10:38 +00:00
MW f3f31744ab patch and files from mantis #1630, Thanks Melanie 2008-06-29 11:48:58 +00:00
Dr Scofield 748f72326d last round of warning squashing. calling it a day now. 2008-06-27 23:03:39 +00:00
Dr Scofield feb30217de dr scofield's warning safari:
* commented out [Obsolete(....)] attributes where no replacement feature
  was available: if we want to attribute code that we think needs to be 
  reworked, we should define a new attribute and use that instead 
  (together with a little tool to retrieve all the attributed code then)
* commenting out unused variables
2008-06-27 16:58:21 +00:00
Sean Dague afd2a4b206 somehow, I seem to have actually made appearance persistant
correctly with nhibernate.  Go figure. :)
User services still remain partial, but I'm going to move
on to Region Store to get that chunk out of the way.
2008-06-27 14:53:56 +00:00
Sean Dague c8cd381c56 added in new type for mapping texture objects to the db 2008-06-27 14:22:18 +00:00
Charles Krinke ca8d1d57e1 Mantis#1591. Thank you graciously, Sempuki for a patch that:
Currently module loading is done ad-hoc. I propose creating a simple 
loader class that leverages Mono.Addins (and perhaps the new .NET 
addins when they become available in mono). Attached is a basic 
patch for review that compiles into HEAD, but doesn't yet replace 
any existing ad-hoc loaders.
2008-06-27 02:15:57 +00:00
Jeff Ames f8ccf00f1c Apply patch from bug #1609 -- Documentation for Data/MSSQL. Thanks kerunix_Flan! 2008-06-26 20:25:57 +00:00
Jeff Ames d96caaa14e Apply patch from bug #1606 -- Documentation for Data/Null, Data/Base. Thanks kerunix_Flan! 2008-06-26 20:20:30 +00:00
Jeff Ames 9fae975a53 Apply patch from bug #1605 -- Documentation for Data/SQLite. Thanks kerunix_Flan! 2008-06-26 20:14:33 +00:00
Jeff Ames ca724636d4 Apply patch from bug #1601 -- more documentation for Data/MySQL. Thanks kerunix_Flan! 2008-06-26 12:38:03 +00:00
Charles Krinke 1c6bf4fe77 Mantis#1595. Thank you, Melanie for a patch that:
Adds pipes for the prim item flags field
2008-06-26 02:51:59 +00:00
Jeff Ames 8a0a0f9bb5 Add patch from bug #1596 - adds Doxygen documentation in OpenSim.Data.MySQL files. Thanks kerunix_Flan! 2008-06-26 01:12:28 +00:00
Sean Dague d1d846f23f chugging away on nhibernate, more incremental process 2008-06-25 19:45:56 +00:00
Sean Dague ce9c584341 add migrations to mysql and sqlite for flags on embedded inventory 2008-06-25 18:57:21 +00:00
Sean Dague ee4d7703a2 lazy=true for these mappings, as we don't do full lists very often 2008-06-25 18:51:48 +00:00
Jeff Ames a2b1a1787d Minor formatting cleanup. 2008-06-25 14:30:28 +00:00
Sean Dague c0a083ad38 based on positive feedback on performance of making keys fixed length
for assets, make all the indexed columns in the inventory fixed length
via migration.
2008-06-24 18:01:28 +00:00
Sean Dague ca7aac1c27 fix typo in Inventory nhibernate mappings. nhibernate should
load now.
2008-06-23 20:02:15 +00:00
Sean Dague 8b6bd93d68 add migration to go from varchar -> char for uuid. Tested
on my machine, and works, but backing up before migrations
is always a good idea.
2008-06-23 16:00:18 +00:00
Teravus Ovares 2758bc81ad * Persists region banlists across reboots for the sqlite datastore also now. 2008-06-21 06:50:38 +00:00
Teravus Ovares a5860ad438 * Adds Region ban capability to Regions. You access this by going to World->Region/Estate. Then on the Estate tab, at the lower right hand corner, clicking the 'Add' button and picking an avatar.
* It only persists across reboots for the mySQL datastore currently.
* Currently have stubs in the other datastores.
2008-06-21 03:29:08 +00:00
Sean Dague 17fd6cf661 lots of futzing with nhibernate to make it more efficient. I
don't think this works, but I don't want to loose the work before
the weekend, and it doesn't break the build.
2008-06-20 20:23:55 +00:00
Teravus Ovares 4448fd4b2f * Handle parcel telehub location corruption gracefully. DBNull
* mySQL this time.
2008-06-20 18:46:43 +00:00
Teravus Ovares f8b1785467 * Handle parcel telehub location corruption gracefully. DBNull 2008-06-20 17:07:01 +00:00
Sean Dague ccc2adb331 fixed to inventory for nhibernate that actually make it so I can
log in using it as the driver for users, assets, inventory.  User
driver is still missing a lot of function.
2008-06-19 22:11:04 +00:00
Sean Dague c2e2997a99 more work towards nhibernate working with mysql, not there yet,
but moving in the right direction.
2008-06-19 21:20:23 +00:00
Sean Dague 40f32a9271 oops, build break. needed to include another reference. 2008-06-19 15:44:33 +00:00
Sean Dague d28a5a4de7 add migrations support for mysql log store. This should complete
all the mysql bits for migration.
2008-06-19 15:42:57 +00:00
Sean Dague fcd7cf5e4a fix an edge case with migrations in the region store.
Add migration support to gridstore.
2008-06-19 15:03:00 +00:00
Sean Dague c2dc1636a6 oops, it helps to reference the *right* migration 2008-06-19 14:46:54 +00:00
Sean Dague 6dea8f3435 clean up the nhibernate definitions to work with mysql
integrate migration support into nhibernate
2008-06-18 21:14:19 +00:00
Sean Dague b58dc7fb33 add mysql migrations for nhibernate driver 2008-06-18 21:08:16 +00:00
Sean Dague 6711adb8b1 add inventory store migration 2008-06-18 20:51:42 +00:00
Sean Dague be79b56cc3 I really didn't expect that one to work out of the box, but just managed
to get NHibernate + MySQL + Assets working.
2008-06-16 19:58:48 +00:00
Sean Dague bdb0dddfcf set CommandTimeout = 0 in the migration commands so that long
migrations (like converting asset ids) don't run into the 
normal 30 second kill switch.
2008-06-16 19:39:08 +00:00
Sean Dague e1409e0c04 be a bit more verbose about what we are doing on the migration
side so that people don't think we're hung.
2008-06-16 19:33:08 +00:00
Sean Dague 340ef33e2e fix nhibernate driver so that it starts (based on the appearance
changes it wouldn't come up).
include embedded dialect specific sql files for nhibernate migrations
figure out how to get the raw db connection so that migrations can
work with nhibernate.
create initial migration for NHibernate + SQLite + Assets.
2008-06-16 19:22:00 +00:00
Sean Dague caa6b8467d futzing around on the NHibernate side again trying to connect
migrations into it.
2008-06-16 18:53:55 +00:00
Sean Dague 94034d665d change some messages on the migrations front to be
more clear
2008-06-16 16:03:37 +00:00
Sean Dague ec78a2871b the beginning of the great id format migration. This makes
asset uuids no longer binary.  I've tested this migration a
few times, and it seems working in all the scenarios I've found
but it wouldn't hurt to backup your asset db before running this
as it does touch a very sensitive part of our content system.
2008-06-16 14:10:51 +00:00
Sean Dague 6c23acf41b add indexes for sqlite inventory 2008-06-13 14:27:46 +00:00
Jeff Ames 64f01ade04 Update svn properties, clean up formatting, refactor out duplicate hard-coded port numbers. 2008-06-13 00:21:53 +00:00
Sean Dague 1451d6fb9a look mom, migrations in action. This adds a couple of indexes
to mysql regions that should help on performance of some of the
selects.  We should start capturing more data on performance bits
to figure out where else we are missing indexes and add them via
migrations as well.
2008-06-12 20:48:06 +00:00
Sean Dague 202a4bec13 Fix mysql migrations. This is tested with an existing up to date schema,
and no schema.  It should also work with a non up to date schema as well.

Btw, meetings in which I can get code done are the right kind of meetings.
2008-06-12 18:44:58 +00:00
Justin Clarke Casey 7cdedcaf0e * minor: Remove and tidy duplicate 'storing object to scene' messages in log 2008-06-12 18:18:59 +00:00
Sean Dague e1140a4f9b this, in theory, adds migration support to mysql for all
data sources besides the grid store.  It is only lightly tested
so the less adventurous should wait a couple of checkins before
upgrading.
2008-06-12 15:47:33 +00:00
Sean Dague cee071ea60 check in region store initial migration definition,
now on to integrating this approach into the mysql
driver.  Beware the next couple of checkins.
2008-06-12 15:21:34 +00:00
Sean Dague 4387744a78 check in migration files for mysql 2008-06-12 14:44:52 +00:00
Sean Dague 6c1fce6147 check in working migration code fore SQLite. This
is now using migrations instead of the old model to
create tables.  Tested for existing old tables, 
and for creating new ones.
2008-06-11 21:01:33 +00:00
Sean Dague 68b98aecab updated resources for current sqlite schema for migrations 2008-06-11 20:04:01 +00:00
Charles Krinke aba396cb32 Mantis#1528. Thank you kindly, Boscata for:
MSSQL Avatar appearance solved.
Appearance functions and modified table.
2008-06-11 13:57:32 +00:00
Sean Dague be400d1bd0 I'm going to need the Version property to manage
migrating from the old to the new system.  Silly legacy
code.
2008-06-10 23:17:18 +00:00
Sean Dague 68cda63761 update of migration code to be more sane on version
tracking, and support sub types that we'll need for
nhibernate.
2008-06-10 22:57:20 +00:00
Charles Krinke 53cc63e243 Mantis#1501. Thank you kindly, Nebadon, for a patch that
addresses the 'terrain fill 0' error.
2008-06-10 16:02:18 +00:00
Jeff Ames 5910a49da6 Update svn properties. Formatting cleanup. 2008-06-10 08:35:46 +00:00
Sean Dague c62f081380 actually create and populate the migrations table correctly. 2008-06-09 22:20:28 +00:00
Sean Dague 69fb4ee208 migrations seem to not break anything at this point.
Tomorrow I'll start trying to integrate them into sqlite
to see if this works right for table migration.
2008-06-09 22:01:21 +00:00
Sean Dague 504ab4477d move Migration support into OpenSim.Data, because it
really turned out to be small enough to not need it's own
assembly
2008-06-09 21:40:16 +00:00
Sean Dague 2e2dde71f2 fill out some more migration facilities 2008-06-09 19:37:13 +00:00
Sean Dague c30e9ff0f1 more work in progress migration code, still a while before
this becomes useful
2008-06-09 19:11:49 +00:00
Sean Dague 283cc90566 start in on the shell for a generic database versioning module. My
intent is to create an easier way to manage database table versions
like the model used for ruby on rails migrations.
2008-06-09 18:24:07 +00:00
mingchen c3292a9afa *Patched CreateItemsTable.sql (MSSQL). Patch by Kyle and Chris from G2. 2008-06-09 14:48:28 +00:00
mingchen de0bd2b5a0 MSSQL Inventory Fix. Patch by Kyle and Chris from G2 2008-06-06 00:56:51 +00:00
Charles Krinke c289c2b6d4 Mantis#1450. Thank you kindly, Boscata for a patch that addresses:
I have detected a bug of conversion data type in OpenSim.Data.MSSQL.MSSQLInventoryData.addInventoryItem(InventoryItemBase item)
in the GroupOwned field.
My sollution is to change the flield to bit in the table. In the 
readInventoryItem(IDataReader reader) change too item.Flags = 
(uint) reader["flags"]; to item.Flags = Convert.ToUInt32(reader["flags"]);
Now Inventory runs fine.
2008-06-05 13:57:58 +00:00
Jeff Ames 4ec4e16c80 Formatting cleanup, minor refactoring, svn properties. 2008-06-04 09:59:27 +00:00
Justin Clarke Casey 4453c8bc5c * experimental: Make OpenSim archiver save and reload all prim textures when not all faces have the same texture 2008-06-02 17:23:13 +00:00
Justin Clarke Casey 0c21f90ba7 * Duh, actually returning from the CreateAsset method once we know the asset exists would be better than carrying on 2008-05-31 21:54:13 +00:00
Justin Clarke Casey 7752211376 * Remove the mysql logging noise I accidentally left in a few commits ago 2008-05-31 21:53:17 +00:00
Justin Clarke Casey d703e2004f * Change MySQL to check whether an asset already exists before inserting it into the database 2008-05-31 21:44:57 +00:00
Teravus Ovares febe78d062 * Implements UserServer logoff in a few situations
* User tries to log-in but is already logged in.  Userserver will send message to simulator user was in to log the user out there.
* From the UserServer, admin types 'logoff-user firstname lastname message'.
* Some regions may not get the message because they're not updated yet.
2008-05-31 12:18:29 +00:00
Jeff Ames 0462510956 Update svn properties. Formatting cleanup. 2008-05-30 08:35:57 +00:00
Sean Dague 858ddfa605 update the nhibernate inventory item base definition 2008-05-28 19:40:42 +00:00
Sean Dague 11d83cb737 actually user the database_connect string for mysql.
This means you can run all the OpenSim grid services without
needing a mysql_connection.ini
2008-05-28 18:12:32 +00:00
Sean Dague 89c164fbc1 let Grid Servers specify a connect string in their configuration. 2008-05-28 17:59:46 +00:00
Sean Dague 7ddf183da4 remove terrain bloat, only keep last terrain revision
for mysql.  For active terraformers this should return
a lot of database space.
2008-05-28 15:02:04 +00:00
Sean Dague a28a6e9aaa remove an erroneous line to fetch the terrain table in a way that
isn't actually used.
2008-05-28 14:57:24 +00:00
Adam Frisby 77281ed85c * Potential fix for Mantis#167, 332 - MySQL Thread collision. 2008-05-26 21:53:32 +00:00
Jeff Ames 5d77625e9a Update svn properties. Formatting cleanup. 2008-05-25 23:27:38 +00:00
Sean Dague 1ebc6bfd0a add a lock on the update, this should have been there before.
still not convinced this will help, but it was wrong.
2008-05-22 18:31:47 +00:00
Sean Dague 3e997772ea implement in memory appearance cache for sqlite. This
isn't db backed, but will hang around between reboots.
2008-05-21 20:36:34 +00:00
Sean Dague 53bcf2139e this removes use of the mapper for wearables, and I can confirm things
get saved to the database.  There are still issues on wearing things
after a cleared cache that I'm looking at now.
2008-05-21 18:02:09 +00:00
Sean Dague 0e39250506 create some direct sql calls for appearance 2008-05-21 14:34:52 +00:00
Sean Dague 6d2f6be82b autocreate appearance table if it isn't there 2008-05-19 21:47:31 +00:00
Sean Dague 419adadc46 prep for changes need to create the appearance tables
by default
2008-05-19 21:39:02 +00:00
Sean Dague d1c4fc94e7 make the super class conveniance appearance stuff virtual
so they can be overrided correctly by subclasses
2008-05-19 20:49:57 +00:00
Sean Dague 9808f39b6f i can haz pantz?
You sure can.  This change set restores pants (and the rest of the
default appearance) in grid mode.  The 
root issue had to do with serializing multi-faced textures to the 
grid server.  This also restores the lookup path through the avatar
factory module, as that seems the reasonable place to have it live.
Some clean up patches are coming later as well, plus testing on 
standalone, but this should be in a good kicking around state for 
grid users.
2008-05-19 19:08:59 +00:00
Jeff Ames a5f08b430d Formatting cleanup. 2008-05-17 00:06:35 +00:00
Sean Dague 8a7ae313be it helps to actually create the database if the connect
string is provided.  My bad.
2008-05-16 18:43:53 +00:00
Sean Dague 0076ed40ff in theory, this moves the appearance mapper to live
under the MySQLUserData.  There is a lot of in theory here
so testing would be appreciated.
2008-05-16 14:30:25 +00:00