Initial update to OpenSim 0.8.2.1 source code.

1 files changed, 82 insertions, 55 deletions

diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/PGSQL/PGSQLAssetData.cs
index c7488d8..5d8b0a2 100644
--- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLAssetData.cs
@@ -27,19 +27,20 @@
 
 using System;
 using System.Data;
-using System.Data.SqlClient;
 using System.Reflection;
 using System.Collections.Generic;
 using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
+using Npgsql;
+using NpgsqlTypes;
 
-namespace OpenSim.Data.MSSQL
+namespace OpenSim.Data.PGSQL
 {
     /// <summary>
-    /// A MSSQL Interface for the Asset server
+    /// A PGSQL Interface for the Asset server
     /// </summary>
-    public class MSSQLAssetData : AssetDataBase
+    public class PGSQLAssetData : AssetDataBase
     {
         private const string _migrationStore = "AssetStore";
 
@@ -48,9 +49,14 @@ namespace OpenSim.Data.MSSQL
         /// <summary>
         /// Database manager
         /// </summary>
-        private MSSQLManager m_database;
+        private PGSQLManager m_database;
         private string m_connectionString;
 
+        protected virtual Assembly Assembly
+        {
+            get { return GetType().Assembly; }
+        }
+
         #region IPlugin Members
 
         override public void Dispose() { }
@@ -61,7 +67,7 @@ namespace OpenSim.Data.MSSQL
         // [Obsolete("Cannot be default-initialized!")]
         override public void Initialise()
         {
-            m_log.Info("[MSSQLAssetData]: " + Name + " cannot be default-initialized!");
+            m_log.Info("[PGSQLAssetData]: " + Name + " cannot be default-initialized!");
             throw new PluginNotInitialisedException(Name);
         }
 
@@ -76,7 +82,7 @@ namespace OpenSim.Data.MSSQL
         {
             m_ticksToEpoch = new System.DateTime(1970, 1, 1).Ticks;
 
-            m_database = new MSSQLManager(connectionString);
+            m_database = new PGSQLManager(connectionString);
             m_connectionString = connectionString;
 
             //New migration to check for DB changes
@@ -96,7 +102,7 @@ namespace OpenSim.Data.MSSQL
         /// </summary>
         override public string Name
         {
-            get { return "MSSQL Asset storage engine"; }
+            get { return "PGSQL Asset storage engine"; }
         }
 
         #endregion
@@ -110,13 +116,13 @@ namespace OpenSim.Data.MSSQL
         /// <returns></returns>
         override public AssetBase GetAsset(UUID assetID)
         {
-            string sql = "SELECT * FROM assets WHERE id = @id";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            string sql = "SELECT * FROM assets WHERE id = :id";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
             {
                 cmd.Parameters.Add(m_database.CreateParameter("id", assetID));
                 conn.Open();
-                using (SqlDataReader reader = cmd.ExecuteReader())
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
                 {
                     if (reader.Read())
                     {
@@ -147,34 +153,38 @@ namespace OpenSim.Data.MSSQL
         {
            
             string sql =
-                @"IF EXISTS(SELECT * FROM assets WHERE id=@id) 
-                    UPDATE assets set name = @name, description = @description, assetType = @assetType,
-                            local = @local, temporary = @temporary, creatorid = @creatorid, data = @data
-                           WHERE id=@id
-                   ELSE
-                    INSERT INTO assets
-                    ([id], [name], [description], [assetType], [local], 
-                     [temporary], [create_time], [access_time], [creatorid], [asset_flags], [data])
-                    VALUES
-                    (@id, @name, @description, @assetType, @local, 
-                     @temporary, @create_time, @access_time, @creatorid, @asset_flags, @data)";
+                @"UPDATE assets set name = :name, description = :description, " + "\"assetType\" " + @" = :assetType,
+                         local = :local, temporary = :temporary, creatorid = :creatorid, data = :data
+                    WHERE id=:id;
+
+                  INSERT INTO assets
+                    (id, name, description, " + "\"assetType\" " + @", local, 
+                     temporary, create_time, access_time, creatorid, asset_flags, data)
+                  Select :id, :name, :description, :assetType, :local, 
+                         :temporary, :create_time, :access_time, :creatorid, :asset_flags, :data
+                   Where not EXISTS(SELECT * FROM assets WHERE id=:id) 
+                ";
             
             string assetName = asset.Name;
-            if (asset.Name.Length > 64)
+            if (asset.Name.Length > AssetBase.MAX_ASSET_NAME)
             {
-                assetName = asset.Name.Substring(0, 64);
-                m_log.Warn("[ASSET DB]: Name field truncated from " + asset.Name.Length + " to " + assetName.Length + " characters on add");
+                assetName = asset.Name.Substring(0, AssetBase.MAX_ASSET_NAME);
+                m_log.WarnFormat(
+                    "[ASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                    asset.Name, asset.ID, asset.Name.Length, assetName.Length);
             }
             
             string assetDescription = asset.Description;
-            if (asset.Description.Length > 64)
+            if (asset.Description.Length > AssetBase.MAX_ASSET_DESC)
             {
-                assetDescription = asset.Description.Substring(0, 64);
-                m_log.Warn("[ASSET DB]: Description field truncated from " + asset.Description.Length + " to " + assetDescription.Length + " characters on add");
+                assetDescription = asset.Description.Substring(0, AssetBase.MAX_ASSET_DESC);
+                m_log.WarnFormat(
+                    "[ASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                    asset.Description, asset.ID, asset.Description.Length, assetDescription.Length);
             }
-            
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand command = new SqlCommand(sql, conn))
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand command = new NpgsqlCommand(sql, conn))
             {
                 int now = (int)((System.DateTime.Now.Ticks - m_ticksToEpoch) / 10000000);
                 command.Parameters.Add(m_database.CreateParameter("id", asset.FullID));
@@ -195,7 +205,7 @@ namespace OpenSim.Data.MSSQL
                 }
                 catch(Exception e)
                 {
-                    m_log.Error("[ASSET DB]: Error storing item :" + e.Message);
+                    m_log.Error("[ASSET DB]: Error storing item :" + e.Message + " sql "+sql);
                 }
             }
         }
@@ -204,11 +214,11 @@ namespace OpenSim.Data.MSSQL
 // Commented out since currently unused - this probably should be called in GetAsset()
 //        private void UpdateAccessTime(AssetBase asset)
 //        {
-//            using (AutoClosingSqlCommand cmd = m_database.Query("UPDATE assets SET access_time = @access_time WHERE id=@id"))
+//            using (AutoClosingSqlCommand cmd = m_database.Query("UPDATE assets SET access_time = :access_time WHERE id=:id"))
 //            {
 //                int now = (int)((System.DateTime.Now.Ticks - m_ticksToEpoch) / 10000000);
-//                cmd.Parameters.AddWithValue("@id", asset.FullID.ToString());
-//                cmd.Parameters.AddWithValue("@access_time", now);
+//                cmd.Parameters.AddWithValue(":id", asset.FullID.ToString());
+//                cmd.Parameters.AddWithValue(":access_time", now);
 //                try
 //                {
 //                    cmd.ExecuteNonQuery();
@@ -221,17 +231,38 @@ namespace OpenSim.Data.MSSQL
 //        }
 
         /// <summary>
-        /// Check if asset exist in m_database
+        /// Check if the assets exist in the database.
         /// </summary>
-        /// <param name="uuid"></param>
-        /// <returns>true if exist.</returns>
-        override public bool ExistsAsset(UUID uuid)
+        /// <param name="uuids">The assets' IDs</param>
+        /// <returns>For each asset: true if it exists, false otherwise</returns>
+        public override bool[] AssetsExist(UUID[] uuids)
         {
-            if (GetAsset(uuid) != null)
+            if (uuids.Length == 0)
+                return new bool[0];
+
+            HashSet<UUID> exist = new HashSet<UUID>();
+
+            string ids = "'" + string.Join("','", uuids) + "'";
+            string sql = string.Format("SELECT id FROM assets WHERE id IN ({0})", ids);
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
             {
-                return true;
+                conn.Open();
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
+                {
+                    while (reader.Read())
+                    {
+                        UUID id = DBGuid.FromDB(reader["id"]);
+                        exist.Add(id);
+                    }
+                }
             }
-            return false;
+
+            bool[] results = new bool[uuids.Length];
+            for (int i = 0; i < uuids.Length; i++)
+                results[i] = exist.Contains(uuids[i]);
+            return results;
         }
 
         /// <summary>
@@ -245,23 +276,19 @@ namespace OpenSim.Data.MSSQL
         public override List<AssetMetadata> FetchAssetMetadataSet(int start, int count)
         {
             List<AssetMetadata> retList = new List<AssetMetadata>(count);
-            string sql = @"WITH OrderedAssets AS
-                (
-                    SELECT id, name, description, assetType, temporary, creatorid,
-                    RowNumber = ROW_NUMBER() OVER (ORDER BY id)
-                    FROM assets 
-                ) 
-                SELECT * 
-                FROM OrderedAssets
-                WHERE RowNumber BETWEEN @start AND @stop;";
+            string sql = @" SELECT id, name, description, " + "\"assetType\"" + @", temporary, creatorid
+                              FROM assets 
+                             order by id
+                             limit :stop
+                            offset :start;";
 
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
             {
                 cmd.Parameters.Add(m_database.CreateParameter("start", start));
                 cmd.Parameters.Add(m_database.CreateParameter("stop", start + count - 1));
                 conn.Open();
-                using (SqlDataReader reader = cmd.ExecuteReader())
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
                 {
                     while (reader.Read())
                     {