Browse Source

File name improvement.

pull/494/head
Sebastian 6 years ago
parent
commit
f806655f96
  1. 2
      backend/src/Squidex.Domain.Apps.Entities.MongoDb/FullText/MongoDirectory.cs
  2. 4
      backend/src/Squidex.Domain.Apps.Entities.MongoDb/FullText/MongoIndexStorage.cs
  3. 12
      backend/src/Squidex.Domain.Apps.Entities/Contents/Text/Lucene/IndexManager.cs
  4. 4
      backend/src/Squidex.Domain.Apps.Entities/Contents/Text/Lucene/Storage/FileIndexStorage.cs
  5. 2
      backend/src/Squidex.Domain.Apps.Entities/Contents/Text/Lucene/Storage/IIndexStorage.cs

2
backend/src/Squidex.Domain.Apps.Entities.MongoDb/FullText/MongoDirectory.cs

@ -98,7 +98,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.FullText
{
EnsureNotDisposed();
var file = FindFile(name) ?? throw new FileNotFoundException();
var file = FindFile(name) ?? throw new FileNotFoundException(null, GetFullName(name));
return file.Length;
}

4
backend/src/Squidex.Domain.Apps.Entities.MongoDb/FullText/MongoIndexStorage.cs

@ -27,9 +27,9 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.FullText
this.bucket = bucket;
}
public Task<LuceneDirectory> CreateDirectoryAsync(Guid schemaId)
public Task<LuceneDirectory> CreateDirectoryAsync(Guid ownerId)
{
var folderName = schemaId.ToString();
var folderName = ownerId.ToString();
var tempFolder = Path.Combine(Path.GetTempPath(), "Indices", folderName);
var tempDirectory = new DirectoryInfo(tempFolder);

12
backend/src/Squidex.Domain.Apps.Entities/Contents/Text/Lucene/IndexManager.cs

@ -45,7 +45,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text.Lucene
return indexStorage.ClearAsync();
}
public async Task<IIndex> AcquireAsync(Guid schemaId)
public async Task<IIndex> AcquireAsync(Guid ownerId)
{
IndexHolder? indexHolder;
@ -53,24 +53,24 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text.Lucene
{
await lockObject.WaitAsync();
if (indices.TryGetValue(schemaId, out indexHolder))
if (indices.TryGetValue(ownerId, out indexHolder))
{
log.LogWarning(w => w
.WriteProperty("message", "Unreleased index found.")
.WriteProperty("schemaId", schemaId.ToString()));
.WriteProperty("ownerId", ownerId.ToString()));
await CommitInternalAsync(indexHolder, true);
}
indexHolder = new IndexHolder(schemaId);
indices[schemaId] = indexHolder;
indexHolder = new IndexHolder(ownerId);
indices[ownerId] = indexHolder;
}
finally
{
lockObject.Release();
}
var directory = await indexStorage.CreateDirectoryAsync(schemaId);
var directory = await indexStorage.CreateDirectoryAsync(ownerId);
indexHolder.Open(directory);

4
backend/src/Squidex.Domain.Apps.Entities/Contents/Text/Lucene/Storage/FileIndexStorage.cs

@ -16,9 +16,9 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text.Lucene.Storage
{
public sealed class FileIndexStorage : IIndexStorage
{
public Task<LuceneDirectory> CreateDirectoryAsync(Guid schemaId)
public Task<LuceneDirectory> CreateDirectoryAsync(Guid ownerId)
{
var folderName = $"Indexes/{schemaId}";
var folderName = $"Indexes/{ownerId}";
var folderPath = Path.Combine(Path.GetTempPath(), folderName);
return Task.FromResult<LuceneDirectory>(FSDirectory.Open(folderPath));

2
backend/src/Squidex.Domain.Apps.Entities/Contents/Text/Lucene/Storage/IIndexStorage.cs

@ -14,7 +14,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text.Lucene
{
public interface IIndexStorage
{
Task<Directory> CreateDirectoryAsync(Guid schemaId);
Task<Directory> CreateDirectoryAsync(Guid ownerId);
Task ClearAsync();

Loading…
Cancel
Save