ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-31 22:05:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

make more use of stream.CopyTo on (de)compressors, plus several cosmetics

Browse Source
This commit is contained in:
UbitUmarov
2025-06-19 20:11:42 +01:00
parent 6180fe5340
commit 4b1df46f6a
14 changed files with 47 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
OpenSim/Data/MySQL/MySQLXAssetData.cs
View File

@@ -231,27 +231,20 @@ namespace OpenSim.Data.MySQL
asset.Description, asset.ID, asset.Description.Length, assetDescription.Length);
}
byte[] data;
if (m_enableCompression)
{
MemoryStream outputStream = new MemoryStream();
using (GZipStream compressionStream = new GZipStream(outputStream, CompressionMode.Compress, false))
{
// Console.WriteLine(WebUtil.CopyTo(new MemoryStream(asset.Data), compressionStream, int.MaxValue));
// We have to close the compression stream in order to make sure it writes everything out to the underlying memory output stream.
compressionStream.Close();
byte[] compressedData = outputStream.ToArray();
asset.Data = compressedData;
}
using MemoryStream inMs = new(asset.Data);
using MemoryStream outputStream = new();
using GZipStream compressionStream = new(outputStream, CompressionMode.Compress);
inMs.CopyTo(compressionStream);
compressionStream.Flush();
data = outputStream.ToArray();
}
else
data = asset.Data;
byte[] hash;
using (HashAlgorithm hasher = SHA256.Create())
hash = hasher.ComputeHash(asset.Data);
// m_log.DebugFormat(
// "[XASSET DB]: Compressed data size for {0} {1}, hash {2} is {3}",
// asset.ID, asset.Name, hash, compressedData.Length);
byte[] hash = SHA256.HashData(data);
try
{
@@ -297,7 +290,7 @@ namespace OpenSim.Data.MySQL
dbcon))
{
cmd.Parameters.AddWithValue("?Hash", hash);
cmd.Parameters.AddWithValue("?Data", asset.Data);
cmd.Parameters.AddWithValue("?Data", data);
cmd.ExecuteNonQuery();
}
}