Skip to content

Commit

Permalink
Support multitenancy in id generators
Browse files Browse the repository at this point in the history
  • Loading branch information
@gliljas
gliljas committed Apr 10, 2023
1 parent 79ad5b8 commit 6b58109
Show file tree
Hide file tree
Showing 34 changed files with 502 additions and 249 deletions.
26 changes: 15 additions & 11 deletions src/NHibernate.Test/Async/IdGen/Enhanced/Forcedtable/HiLoForcedTableSequenceTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,20 @@
//------------------------------------------------------------------------------


using NUnit.Framework;
using NHibernate.Id.Enhanced;
using System.Collections;
using NHibernate.Test.MultiTenancy;
using NUnit.Framework;

namespace NHibernate.Test.IdGen.Enhanced.Forcedtable
{
using System.Threading.Tasks;
[TestFixture]
public class HiLoForcedTableSequenceTestAsync : TestCase
[TestFixture(null)]
[TestFixture("test")]
public class HiLoForcedTableSequenceTestAsync : TestCaseWithMultiTenancy
{
public HiLoForcedTableSequenceTestAsync(string tenantIdentifier) : base(tenantIdentifier)
{
}
protected override string[] Mappings
{
get { return new[] { "IdGen.Enhanced.Forcedtable.HiLo.hbm.xml" }; }
Expand Down Expand Up @@ -54,19 +58,19 @@ public async Task TestNormalBoundaryAsync()
long expectedId = i + 1;
Assert.That(entities[i].Id, Is.EqualTo(expectedId));
Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(1)); // initialization
Assert.That(optimizer.LastSourceValue, Is.EqualTo(1)); // initialization
Assert.That(optimizer.LastValue, Is.EqualTo(i + 1));
Assert.That(optimizer.HiValue, Is.EqualTo(increment + 1));
Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(1)); // initialization
Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(i + 1));
Assert.That(optimizer.GetHiValue(TenantIdentifier), Is.EqualTo(increment + 1));
}

// now force a "clock over"
entities[increment] = new Entity("" + increment);
await (session.SaveAsync(entities[increment]));
Assert.That(entities[optimizer.IncrementSize].Id, Is.EqualTo(optimizer.IncrementSize + 1));
Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(2)); // initialization + clock-over
Assert.That(optimizer.LastSourceValue, Is.EqualTo(2)); // initialization + clock-over
Assert.That(optimizer.LastValue, Is.EqualTo(increment + 1));
Assert.That(optimizer.HiValue, Is.EqualTo(increment * 2 + 1));
Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(2)); // initialization + clock-over
Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(increment + 1));
Assert.That(optimizer.GetHiValue(TenantIdentifier), Is.EqualTo(increment * 2 + 1));

await (transaction.CommitAsync());
}
Expand All @@ -85,4 +89,4 @@ public async Task TestNormalBoundaryAsync()
}
}
}
}
}
22 changes: 13 additions & 9 deletions src/NHibernate.Test/Async/IdGen/Enhanced/Forcedtable/PooledForcedTableSequenceTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,20 @@
//------------------------------------------------------------------------------


using NUnit.Framework;
using NHibernate.Id.Enhanced;
using System.Collections;
using NHibernate.Test.MultiTenancy;
using NUnit.Framework;

namespace NHibernate.Test.IdGen.Enhanced.Forcedtable
{
using System.Threading.Tasks;
[TestFixture]
public class PooledForcedTableSequenceTestAsync : TestCase
[TestFixture(null)]
[TestFixture("test")]
public class PooledForcedTableSequenceTestAsync : TestCaseWithMultiTenancy
{
public PooledForcedTableSequenceTestAsync(string tenantIdentifier) : base(tenantIdentifier)
{
}
protected override string[] Mappings
{
get { return new[] { "IdGen.Enhanced.Forcedtable.Pooled.hbm.xml" }; }
Expand Down Expand Up @@ -55,8 +59,8 @@ public async Task TestNormalBoundaryAsync()
Assert.That(entities[i].Id, Is.EqualTo(expectedId));
// NOTE : initialization calls table twice
Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(2)); // initialization
Assert.That(optimizer.LastSourceValue, Is.EqualTo(increment + 1)); // initialization
Assert.That(optimizer.LastValue, Is.EqualTo(i + 1));
Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(increment + 1)); // initialization
Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(i + 1));
}

// now force a "clock over"
Expand All @@ -66,8 +70,8 @@ public async Task TestNormalBoundaryAsync()
Assert.That(entities[optimizer.IncrementSize].Id, Is.EqualTo(optimizer.IncrementSize + 1));
// initialization (2) + clock over
Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(3));
Assert.That(optimizer.LastSourceValue, Is.EqualTo(increment*2 + 1));
Assert.That(optimizer.LastValue, Is.EqualTo(increment + 1));
Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(increment*2 + 1));
Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(increment + 1));

await (transaction.CommitAsync());
}
Expand All @@ -86,4 +90,4 @@ public async Task TestNormalBoundaryAsync()
}
}
}
}
}
2 changes: 1 addition & 1 deletion src/NHibernate.Test/Async/IdGen/Enhanced/OptimizerTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
//------------------------------------------------------------------------------


using NUnit.Framework;
using NHibernate.Id.Enhanced;
using NUnit.Framework;

namespace NHibernate.Test.IdGen.Enhanced
{
Expand Down
23 changes: 14 additions & 9 deletions src/NHibernate.Test/Async/IdGen/Enhanced/Sequence/HiLoSequenceTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,18 @@
using System.Collections;
using NUnit.Framework;
using NHibernate.Id.Enhanced;
using NHibernate.Test.MultiTenancy;

namespace NHibernate.Test.IdGen.Enhanced.Sequence
{
using System.Threading.Tasks;
[TestFixture]
public class HiLoSequenceTestAsync : TestCase
[TestFixture(null)]
[TestFixture("test")]
public class HiLoSequenceTestAsync : TestCaseWithMultiTenancy
{
public HiLoSequenceTestAsync(string tenantIdentifier) : base(tenantIdentifier)
{
}
protected override string[] Mappings
{
get { return new[] { "IdGen.Enhanced.Sequence.HiLo.hbm.xml" }; }
Expand Down Expand Up @@ -51,18 +56,18 @@ public async Task TestNormalBoundaryAsync()
entities[i] = new Entity("" + (i + 1));
await (session.SaveAsync(entities[i]));
Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(1)); // initialization
Assert.That(optimizer.LastSourceValue, Is.EqualTo(1)); // initialization
Assert.That(optimizer.LastValue, Is.EqualTo(i + 1));
Assert.That(optimizer.HiValue, Is.EqualTo(increment + 1));
Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(1)); // initialization
Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(i + 1));
Assert.That(optimizer.GetHiValue(TenantIdentifier), Is.EqualTo(increment + 1));
}

// now force a "clock over"
entities[increment] = new Entity("" + increment);
await (session.SaveAsync(entities[increment]));
Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(2));
Assert.That(optimizer.LastSourceValue, Is.EqualTo(2));
Assert.That(optimizer.LastValue, Is.EqualTo(increment + 1));
Assert.That(optimizer.HiValue, Is.EqualTo(increment * 2 + 1));
Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(2));
Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(increment + 1));
Assert.That(optimizer.GetHiValue(TenantIdentifier), Is.EqualTo(increment * 2 + 1));

await (transaction.CommitAsync());
}
Expand All @@ -80,4 +85,4 @@ public async Task TestNormalBoundaryAsync()
}
}
}
}
}
22 changes: 13 additions & 9 deletions src/NHibernate.Test/Async/IdGen/Enhanced/Sequence/PooledSequenceTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,20 @@
//------------------------------------------------------------------------------


using System.Collections;
using NUnit.Framework;
using NHibernate.Id.Enhanced;
using NHibernate.Test.MultiTenancy;
using NUnit.Framework;

namespace NHibernate.Test.IdGen.Enhanced.Sequence
{
using System.Threading.Tasks;
[TestFixture]
public class PooledSequenceTestAsync : TestCase
[TestFixture(null)]
[TestFixture("test")]
public class PooledSequenceTestAsync : TestCaseWithMultiTenancy
{
public PooledSequenceTestAsync(string tenantIdentifier) : base(tenantIdentifier)
{
}
protected override string[] Mappings
{
get { return new[] { "IdGen.Enhanced.Sequence.Pooled.hbm.xml" }; }
Expand Down Expand Up @@ -51,16 +55,16 @@ public async Task TestNormalBoundaryAsync()
entities[i] = new Entity("" + (i + 1));
await (session.SaveAsync(entities[i]));
Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(2)); // initialization calls seq twice
Assert.That(optimizer.LastSourceValue, Is.EqualTo(increment + 1)); // initialization calls seq twice
Assert.That(optimizer.LastValue, Is.EqualTo(i + 1));
Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(increment + 1)); // initialization calls seq twice
Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(i + 1));
}

// now force a "clock over"
entities[increment] = new Entity("" + increment);
await (session.SaveAsync(entities[increment]));
Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(3)); // initialization (2) + clock over
Assert.That(optimizer.LastSourceValue, Is.EqualTo(increment * 2 + 1)); // initialization (2) + clock over
Assert.That(optimizer.LastValue, Is.EqualTo(increment + 1));
Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(increment * 2 + 1)); // initialization (2) + clock over
Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(increment + 1));

await (transaction.CommitAsync());
}
Expand All @@ -79,4 +83,4 @@ public async Task TestNormalBoundaryAsync()
}
}
}
}
}
2 changes: 1 addition & 1 deletion src/NHibernate.Test/Async/IdGen/Enhanced/SourceMock.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ public Task<long> GetNextValueAsync(CancellationToken cancellationToken)
}
}
}
}
}
21 changes: 13 additions & 8 deletions src/NHibernate.Test/Async/IdGen/Enhanced/Table/HiLoTableTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,19 @@

using System.Collections;
using NHibernate.Id.Enhanced;
using NHibernate.Test.MultiTenancy;
using NUnit.Framework;

namespace NHibernate.Test.IdGen.Enhanced.Table
{
using System.Threading.Tasks;
[TestFixture]
public class HiLoTableTestAsync : TestCase
[TestFixture(null)]
[TestFixture("test")]
public class HiLoTableTestAsync : TestCaseWithMultiTenancy
{
public HiLoTableTestAsync(string tenantIdentifier) : base(tenantIdentifier)
{
}
protected override string[] Mappings
{
get { return new[] { "IdGen.Enhanced.Table.HiLo.hbm.xml" }; }
Expand Down Expand Up @@ -50,18 +55,18 @@ public async Task TestNormalBoundaryAsync()
entities[i] = new Entity("" + (i + 1));
await (s.SaveAsync(entities[i]));
Assert.That(generator.TableAccessCount, Is.EqualTo(1)); // initialization
Assert.That(optimizer.LastSourceValue, Is.EqualTo(1)); // initialization
Assert.That(optimizer.LastValue, Is.EqualTo(i + 1));
Assert.That(optimizer.HiValue, Is.EqualTo(increment + 1));
Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(1)); // initialization
Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(i + 1));
Assert.That(optimizer.GetHiValue(TenantIdentifier), Is.EqualTo(increment + 1));
}

// now force a "clock over"
entities[increment] = new Entity("" + increment);
await (s.SaveAsync(entities[increment]));
Assert.That(generator.TableAccessCount, Is.EqualTo(2));
Assert.That(optimizer.LastSourceValue, Is.EqualTo(2));
Assert.That(optimizer.LastValue, Is.EqualTo(increment + 1));
Assert.That(optimizer.HiValue, Is.EqualTo((increment * 2) + 1));
Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(2));
Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(increment + 1));
Assert.That(optimizer.GetHiValue(TenantIdentifier), Is.EqualTo((increment * 2) + 1));
await (transaction.CommitAsync());
}

Expand Down
17 changes: 11 additions & 6 deletions src/NHibernate.Test/Async/IdGen/Enhanced/Table/PooledLoTableTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,19 @@

using System.Collections;
using NHibernate.Id.Enhanced;
using NHibernate.Test.MultiTenancy;
using NUnit.Framework;

namespace NHibernate.Test.IdGen.Enhanced.Table
{
using System.Threading.Tasks;
[TestFixture]
public class PooledLoTableTestAsync : TestCase
[TestFixture(null)]
[TestFixture("test")]
public class PooledLoTableTestAsync : TestCaseWithMultiTenancy
{
public PooledLoTableTestAsync(string tenantIdentifier) : base(tenantIdentifier)
{
}
protected override string[] Mappings
{
get { return new[] { "IdGen.Enhanced.Table.PooledLo.hbm.xml" }; }
Expand Down Expand Up @@ -50,16 +55,16 @@ public async Task TestNormalBoundaryAsync()
entities[i] = new Entity("" + (i + 1));
await (s.SaveAsync(entities[i]));
Assert.That(generator.TableAccessCount, Is.EqualTo(1)); // initialization
Assert.That(optimizer.LastSourceValue, Is.EqualTo(1)); // initialization
Assert.That(optimizer.LastValue, Is.EqualTo(i + 1));
Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(1)); // initialization
Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(i + 1));
}

// now force a "clock over"
entities[increment] = new Entity("" + increment);
await (s.SaveAsync(entities[increment]));
Assert.That(generator.TableAccessCount, Is.EqualTo(2));
Assert.That(optimizer.LastSourceValue, Is.EqualTo(increment + 1));
Assert.That(optimizer.LastValue, Is.EqualTo(increment + 1));
Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(increment + 1));
Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(increment + 1));

await (transaction.CommitAsync());
}
Expand Down
18 changes: 11 additions & 7 deletions src/NHibernate.Test/Async/IdGen/Enhanced/Table/PooledTableTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,20 @@
//------------------------------------------------------------------------------


using System.Collections;
using NHibernate.Id.Enhanced;
using NHibernate.Test.MultiTenancy;
using NUnit.Framework;

namespace NHibernate.Test.IdGen.Enhanced.Table
{
using System.Threading.Tasks;
[TestFixture]
public class PooledTableTestAsync : TestCase
[TestFixture(null)]
[TestFixture("test")]
public class PooledTableTestAsync : TestCaseWithMultiTenancy
{
public PooledTableTestAsync(string tenantIdentifier) : base(tenantIdentifier)
{
}
protected override string[] Mappings
{
get { return new[] { "IdGen.Enhanced.Table.Pooled.hbm.xml" }; }
Expand Down Expand Up @@ -50,16 +54,16 @@ public async Task TestNormalBoundaryAsync()
entities[i] = new Entity("" + (i + 1));
await (s.SaveAsync(entities[i]));
Assert.That(generator.TableAccessCount, Is.EqualTo(2)); // initialization calls seq twice
Assert.That(optimizer.LastSourceValue, Is.EqualTo(increment + 1)); // initialization calls seq twice
Assert.That(optimizer.LastValue, Is.EqualTo(i + 1));
Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(increment + 1)); // initialization calls seq twice
Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(i + 1));
}

// now force a "clock over"
entities[increment] = new Entity("" + increment);
await (s.SaveAsync(entities[increment]));
Assert.That(generator.TableAccessCount, Is.EqualTo(3)); // initialization (2) + clock over
Assert.That(optimizer.LastSourceValue, Is.EqualTo((increment * 2) + 1)); // initialization (2) + clock over
Assert.That(optimizer.LastValue, Is.EqualTo(increment + 1));
Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo((increment * 2) + 1)); // initialization (2) + clock over
Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(increment + 1));

await (transaction.CommitAsync());
}
Expand Down
Loading

0 comments on commit 6b58109

Please sign in to comment.