Skip to content

Commit 52f3ab2

Browse files
alex-kulakovalex-kulakov
committed
Removes Domain.SelectStorageNode and its usage
1 parent cf53ce9 commit 52f3ab2

25 files changed

+78
-120
lines changed

‎Extensions/Xtensive.Orm.Localization.Tests/MultipleNodesTest.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ protected override DomainConfiguration BuildConfiguration()
6060
[Test]
6161
public void Node1Test01()
6262
{
63-
var selectedNode = Domain.SelectStorageNode(WellKnown.DefaultNodeId);
63+
var selectedNode = Domain.StorageNodeManager.GetNode(WellKnown.DefaultNodeId);
6464
using (var session = selectedNode.OpenSession())
6565
using (var transaction = session.OpenTransaction()) {
6666
var welcomePage = new Page(session);
@@ -76,7 +76,7 @@ public void Node1Test01()
7676
[Test]
7777
public void Node1Test02()
7878
{
79-
var selectedNode = Domain.SelectStorageNode(WellKnown.DefaultNodeId);
79+
var selectedNode = Domain.StorageNodeManager.GetNode(WellKnown.DefaultNodeId);
8080
using (var session = selectedNode.OpenSession())
8181
using (var transaction = session.OpenTransaction()) {
8282
var welcomePage = new Page(session);
@@ -95,7 +95,7 @@ public void Node1Test02()
9595
[Test]
9696
public void Node2Test01()
9797
{
98-
var selectedNode = Domain.SelectStorageNode(Node1Id);
98+
var selectedNode = Domain.StorageNodeManager.GetNode(Node1Id);
9999
using (var session = selectedNode.OpenSession())
100100
using (var transaction = session.OpenTransaction()) {
101101
var welcomePage = new Page(session);
@@ -111,7 +111,7 @@ public void Node2Test01()
111111
[Test]
112112
public void Node2Test02()
113113
{
114-
var selectedNode = Domain.SelectStorageNode(Node1Id);
114+
var selectedNode = Domain.StorageNodeManager.GetNode(Node1Id);
115115
using (var session = selectedNode.OpenSession())
116116
using (var transaction = session.OpenTransaction()) {
117117
var welcomePage = new Page(session);
@@ -130,7 +130,7 @@ public void Node2Test02()
130130
[Test]
131131
public void Node3Test01()
132132
{
133-
var selectedNode = Domain.SelectStorageNode(Node2Id);
133+
var selectedNode = Domain.StorageNodeManager.GetNode(Node2Id);
134134
using (var session = selectedNode.OpenSession())
135135
using (var transaction = session.OpenTransaction()) {
136136
var welcomePage = new Page(session);
@@ -146,7 +146,7 @@ public void Node3Test01()
146146
[Test]
147147
public void Node3Test02()
148148
{
149-
var selectedNode = Domain.SelectStorageNode(Node2Id);
149+
var selectedNode = Domain.StorageNodeManager.GetNode(Node2Id);
150150
using (var session = selectedNode.OpenSession())
151151
using (var transaction = session.OpenTransaction()) {
152152
var welcomePage = new Page(session);
@@ -165,7 +165,7 @@ public void Node3Test02()
165165
[Test]
166166
public void Node4Test01()
167167
{
168-
var selectedNode = Domain.SelectStorageNode(Node3Id);
168+
var selectedNode = Domain.StorageNodeManager.GetNode(Node3Id);
169169
using (var session = selectedNode.OpenSession())
170170
using (var transaction = session.OpenTransaction()) {
171171
var welcomePage = new Page(session);
@@ -181,7 +181,7 @@ public void Node4Test01()
181181
[Test]
182182
public void Node4Test02()
183183
{
184-
var selectedNode = Domain.SelectStorageNode(Node3Id);
184+
var selectedNode = Domain.StorageNodeManager.GetNode(Node3Id);
185185
using (var session = selectedNode.OpenSession())
186186
using (var transaction = session.OpenTransaction()) {
187187
var welcomePage = new Page(session);
@@ -200,7 +200,7 @@ public void Node4Test02()
200200
[Test]
201201
public void Node5Test01()
202202
{
203-
var selectedNode = Domain.SelectStorageNode(Node4Id);
203+
var selectedNode = Domain.StorageNodeManager.GetNode(Node4Id);
204204
using (var session = selectedNode.OpenSession())
205205
using (var transaction = session.OpenTransaction()) {
206206
var welcomePage = new Page(session);
@@ -216,7 +216,7 @@ public void Node5Test01()
216216
[Test]
217217
public void Node5Test02()
218218
{
219-
var selectedNode = Domain.SelectStorageNode(Node4Id);
219+
var selectedNode = Domain.StorageNodeManager.GetNode(Node4Id);
220220
using (var session = selectedNode.OpenSession())
221221
using (var transaction = session.OpenTransaction()) {
222222
var welcomePage = new Page(session);

‎Orm/Xtensive.Orm.Tests/Issues/IssueJira0614_TypeMappingCachingInMaterializationContext.cs‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -266,10 +266,8 @@ public void Test01()
266266
var multinodeDomainConfiguration = CreateConfiguration(typeof(Target.TimesheetCode), DomainUpgradeMode.Skip, "Model1");
267267
var nodeConfiguration = CreateNodeConfiguration(Node2Name, "Model1", "Model2", DomainUpgradeMode.Skip);
268268

269-
using (var domain = BuildDomain(multinodeDomainConfiguration)) {
270-
_ = domain.StorageNodeManager.AddNode(nodeConfiguration);
271-
var selectedNode = domain.SelectStorageNode(WellKnown.DefaultNodeId);
272-
using (var session = selectedNode.OpenSession()) {
269+
using (var domain = BuildDomain(multinodeDomainConfiguration, nodeConfiguration)) {
270+
using (var session = domain.OpenSession()) {
273271
using (var transaction = session.OpenTransaction()) {
274272
var list = session.Query.All<Target.TimesheetCode>()
275273
.Where(c => c.Active)
@@ -295,7 +293,7 @@ public void Test01()
295293
}
296294
}
297295

298-
selectedNode = domain.SelectStorageNode(Node2Name);
296+
var selectedNode = domain.StorageNodeManager.GetNode(Node2Name);
299297
using (var session = selectedNode.OpenSession())
300298
using (var transaction = session.OpenTransaction()) {
301299
var list = session.Query.All<Target.TimesheetCode>()
@@ -381,8 +379,7 @@ public void Test02()
381379
var nodeConfiguration = CreateNodeConfiguration(Node1Name, "Model2", "Model1", DomainUpgradeMode.PerformSafely);
382380

383381
using (var domain = BuildDomain(multinodeDomainConfiguration, nodeConfiguration)) {
384-
var selectedNode = domain.SelectStorageNode(WellKnown.DefaultNodeId);
385-
using (var session = selectedNode.OpenSession()) {
382+
using (var session = domain.OpenSession()) {
386383
using (var transaction = session.OpenTransaction()) {
387384
var list = session.Query.All<Target.TimesheetCode>()
388385
.Where(c => c.Active)
@@ -408,7 +405,7 @@ public void Test02()
408405
}
409406
}
410407

411-
selectedNode = domain.SelectStorageNode(Node1Name);
408+
var selectedNode = domain.StorageNodeManager.GetNode(Node1Name);
412409
using (var session = selectedNode.OpenSession()) {
413410
using (var transaction = session.OpenTransaction()) {
414411
var list = session.Query.All<Target.TimesheetCode>()
@@ -434,11 +431,6 @@ public void Test02()
434431
}
435432
}
436433

437-
private void CheckRequirements()
438-
{
439-
Require.ProviderIs(StorageProvider.SqlServer);
440-
}
441-
442434
private Domain BuildDomain(DomainConfiguration configuration, NodeConfiguration nodeConfiguration = null)
443435
{
444436
try{

‎Orm/Xtensive.Orm.Tests/Issues/IssueJira0647_StoredDomainModelMappingsUpdateBug.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ private void BuildBaseVersion()
464464
_ = domain.StorageNodeManager.AddNode(BuildNodeConfiguration(domain.Configuration, alpha, DomainUpgradeMode.Recreate));
465465
_ = domain.StorageNodeManager.AddNode(BuildNodeConfiguration(domain.Configuration, beta, DomainUpgradeMode.Recreate));
466466

467-
var selectedNode = domain.SelectStorageNode(alpha.Name);
467+
var selectedNode = domain.StorageNodeManager.GetNode(alpha.Name);
468468
using (var session = selectedNode.OpenSession())
469469
using (var tx = session.OpenTransaction()) {
470470
_ = new ModelNamespace.HintTest.BaseVersion.Customer { Name = "CustomerName" };

‎Orm/Xtensive.Orm.Tests/Storage/Multinode/ConnectionOverrideTest.cs‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ void commandValidator(object sender, DbCommandEventArgs args)
5151
}
5252

5353
using (var domain = Domain.Build(domainConfig)) {
54-
var selectedNode = domain.SelectStorageNode(WellKnown.DefaultNodeId);
55-
using (var session = selectedNode.OpenSession())
54+
using (var session = domain.OpenSession())
5655
using (var tx = session.OpenTransaction()) {
5756
var connection = ((SqlSessionHandler) session.Handler).Connection;
5857
Assert.That(connection.ConnectionInfo, Is.EqualTo(domainConfig.ConnectionInfo));
@@ -62,8 +61,7 @@ void commandValidator(object sender, DbCommandEventArgs args)
6261
session.Events.DbCommandExecuted -= commandValidator;
6362
}
6463

65-
_ = domain.StorageNodeManager.AddNode(nodeConfig);
66-
selectedNode = domain.SelectStorageNode("Additional");
64+
var selectedNode = domain.StorageNodeManager.GetOrAddNode(nodeConfig);
6765
using (var session = selectedNode.OpenSession())
6866
using (var tx = session.OpenTransaction()){
6967
var connection = ((SqlSessionHandler) session.Handler).Connection;
@@ -105,8 +103,7 @@ void commandValidator(object sender, DbCommandEventArgs args)
105103
}
106104

107105
using (var domain = Domain.Build(domainConfig)) {
108-
var selectedNode = domain.SelectStorageNode(WellKnown.DefaultNodeId);
109-
using (var session = selectedNode.OpenSession())
106+
using (var session = domain.OpenSession())
110107
using (var tx = session.OpenTransaction()) {
111108
var connection = ((SqlSessionHandler) session.Handler).Connection;
112109
Assert.That(connection.ConnectionInfo, Is.EqualTo(domainConfig.ConnectionInfo));
@@ -116,8 +113,7 @@ void commandValidator(object sender, DbCommandEventArgs args)
116113
session.Events.DbCommandExecuted -= commandValidator;
117114
}
118115

119-
_ = domain.StorageNodeManager.AddNode(nodeConfig);
120-
selectedNode = domain.SelectStorageNode("Additional");
116+
var selectedNode = domain.StorageNodeManager.GetOrAddNode(nodeConfig);
121117
using (var session = selectedNode.OpenSession())
122118
using (var tx = session.OpenTransaction()) {
123119
var connection = ((SqlSessionHandler) session.Handler).Connection;

‎Orm/Xtensive.Orm.Tests/Storage/Multinode/DynamicTypeIdTest.cs‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -335,17 +335,15 @@ public void TypeIdExtractionTest()
335335
using (domain) {
336336
var nodeConfiguration = new NodeConfiguration(AlternativeSchema) {UpgradeMode = DomainUpgradeMode.Validate};
337337
nodeConfiguration.SchemaMapping.Add(DefaultSchema, AlternativeSchema);
338-
_ = domain.StorageNodeManager.AddNode(nodeConfiguration);
339338

340-
var selectedNode = domain.SelectStorageNode(WellKnown.DefaultNodeId);
341-
using (var session = selectedNode.OpenSession()) {
339+
using (var session = domain.OpenSession()) {
342340
var types = new[] { typeof(BaseEntity), typeof(Entity1), typeof(Entity2) };
343341
foreach (var type in types) {
344342
Assert.That(session.StorageNode.TypeIdRegistry[domain.Model.Types[type]], Is.EqualTo(defaultSchemaMap[type]));
345343
}
346344
}
347345

348-
selectedNode = domain.SelectStorageNode(AlternativeSchema);
346+
var selectedNode = domain.StorageNodeManager.GetOrAddNode(nodeConfiguration);
349347
using (var session = selectedNode.OpenSession()) {
350348
var types = new[] { typeof(BaseEntity), typeof(Entity1), typeof(Entity2) };
351349
foreach (var type in types) {
@@ -363,7 +361,7 @@ private void MainTestBody(Domain domain, string nodeId)
363361
var stringValue = "entity1 " + nodeId;
364362
var intValue = stringValue.Length;
365363

366-
var selectedNode = domain.SelectStorageNode(nodeId);
364+
var selectedNode = domain.StorageNodeManager.GetNode(nodeId);
367365
using (var session = selectedNode.OpenSession())
368366
using (var tx = session.OpenTransaction()) {
369367
var baseEntity = new BaseEntity {Name = baseName};
@@ -372,7 +370,7 @@ private void MainTestBody(Domain domain, string nodeId)
372370
tx.Complete();
373371
}
374372

375-
selectedNode = domain.SelectStorageNode(nodeId);
373+
selectedNode = domain.StorageNodeManager.GetNode(nodeId);
376374
using (var session = selectedNode.OpenSession())
377375
using (var tx = session.OpenTransaction()) {
378376
var baseTypeId = GetTypeId(session, typeof(BaseEntity));
@@ -400,7 +398,7 @@ private void MainTestBody(Domain domain, string nodeId)
400398

401399
private void NonAbstractTypesTestBody(Domain domain, string nodeId)
402400
{
403-
var selectedNode = domain.SelectStorageNode(nodeId);
401+
var selectedNode = domain.StorageNodeManager.GetNode(nodeId);
404402
using (var session = selectedNode.OpenSession())
405403
using (var trasaction = session.OpenTransaction()) {
406404
var query1 = session.Query.All<Entity1>();
@@ -441,7 +439,7 @@ private void NonAbstractTypesTestBody(Domain domain, string nodeId)
441439

442440
private void AbstractClassDescendantsTestBody(Domain domain, string nodeId)
443441
{
444-
var selectedNode = domain.SelectStorageNode(nodeId);
442+
var selectedNode = domain.StorageNodeManager.GetNode(nodeId);
445443
using (var session = selectedNode.OpenSession())
446444
using (var trasaction = session.OpenTransaction()) {
447445
var query1 = session.Query.All<Entity3>();
@@ -483,7 +481,7 @@ private void AbstractClassDescendantsTestBody(Domain domain, string nodeId)
483481

484482
private void InterfaceTestBody(Domain domain, string nodeId)
485483
{
486-
var selectedNode = domain.SelectStorageNode(nodeId);
484+
var selectedNode = domain.StorageNodeManager.GetNode(nodeId);
487485
using (var session = selectedNode.OpenSession())
488486
using (var trasaction = session.OpenTransaction()) {
489487
var firstImplementationsBaseQuery = session.Query.All<SomeInterfaceImpl1>();

‎Orm/Xtensive.Orm.Tests/Storage/Multinode/InitializationSqlOverrideTest.cs‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ public void NullNodeInitSql()
4141
nodeConfig.SchemaMapping.Add("dbo", "Model1");
4242

4343
using (var domain = Domain.Build(domainConfig)) {
44-
var selectedNode = domain.SelectStorageNode(WellKnown.DefaultNodeId);
45-
using (var session = selectedNode.OpenSession())
44+
using (var session = domain.OpenSession())
4645
using (var tx = session.OpenTransaction()) {
4746
var service = session.Services.Get<DirectSqlAccessor>();
4847
using (var command = service.CreateCommand()) {
@@ -52,8 +51,7 @@ public void NullNodeInitSql()
5251
}
5352
}
5453

55-
_ = domain.StorageNodeManager.AddNode(nodeConfig);
56-
selectedNode = domain.SelectStorageNode("Additional");
54+
var selectedNode = domain.StorageNodeManager.GetOrAddNode(nodeConfig);
5755
using (var session = selectedNode.OpenSession())
5856
using (var tx = session.OpenTransaction()) {
5957
var service = session.Services.Get<DirectSqlAccessor>();
@@ -81,8 +79,7 @@ public void EmptyStringIninSql()
8179
nodeConfig.SchemaMapping.Add("dbo", "Model1");
8280

8381
using (var domain = Domain.Build(domainConfig)) {
84-
var selectedNode = domain.SelectStorageNode(WellKnown.DefaultNodeId);
85-
using (var session = selectedNode.OpenSession())
82+
using (var session = domain.OpenSession())
8683
using (var tx = session.OpenTransaction()) {
8784
var connection = ((SqlSessionHandler) session.Handler).Connection;
8885
Assert.That(connection.ConnectionInfo, Is.EqualTo(domainConfig.ConnectionInfo));
@@ -95,8 +92,7 @@ public void EmptyStringIninSql()
9592
}
9693
}
9794

98-
_ = domain.StorageNodeManager.AddNode(nodeConfig);
99-
selectedNode = domain.SelectStorageNode("Additional");
95+
var selectedNode = domain.StorageNodeManager.GetOrAddNode(nodeConfig);
10096
using (var session = selectedNode.OpenSession())
10197
using (var tx = session.OpenTransaction()) {
10298
var service = session.Services.Get<DirectSqlAccessor>();
@@ -124,8 +120,7 @@ public void ValidInitSql()
124120
nodeConfig.SchemaMapping.Add("dbo", "dbo");
125121

126122
using (var domain = Domain.Build(domainConfig)) {
127-
var selectedNode = domain.SelectStorageNode(WellKnown.DefaultNodeId);
128-
using (var session = selectedNode.OpenSession())
123+
using (var session = domain.OpenSession())
129124
using (var tx = session.OpenTransaction()) {
130125
var connection = ((SqlSessionHandler) session.Handler).Connection;
131126
Assert.That(connection.ConnectionInfo, Is.EqualTo(domainConfig.ConnectionInfo));
@@ -138,8 +133,7 @@ public void ValidInitSql()
138133
}
139134
}
140135

141-
_ = domain.StorageNodeManager.AddNode(nodeConfig);
142-
selectedNode = domain.SelectStorageNode("Additional");
136+
var selectedNode = domain.StorageNodeManager.GetOrAddNode(nodeConfig);
143137
using (var session = selectedNode.OpenSession())
144138
using (var tx = session.OpenTransaction()) {
145139
var service = session.Services.Get<DirectSqlAccessor>();

‎Orm/Xtensive.Orm.Tests/Storage/Multinode/ObsoleteSelectStorageNodeTest.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,16 @@ protected override Domain BuildDomain(DomainConfiguration configuration)
5858

5959
protected override void PopulateData()
6060
{
61-
var defaultNodeSelection = Domain.SelectStorageNode(WellKnown.DefaultNodeId);
62-
using (var nodeSession = defaultNodeSelection.OpenSession())
61+
using (var nodeSession = Domain.OpenSession())
6362
using (var tx = nodeSession.OpenTransaction()) {
6463
_ = new TestEntity(nodeSession) { NodeTag = DefaultNodeTag };
6564
_ = new TestEntity(nodeSession) { NodeTag = DefaultNodeTag };
6665
_ = new TestEntity(nodeSession) { NodeTag = DefaultNodeTag };
6766
tx.Complete();
6867
}
6968

70-
var additonalNodeSelection = Domain.SelectStorageNode(AdditionalNodeName);
71-
using (var nodeSession = additonalNodeSelection.OpenSession())
69+
var additonalNode = Domain.StorageNodeManager.GetNode(AdditionalNodeName);
70+
using (var nodeSession = additonalNode.OpenSession())
7271
using (var tx = nodeSession.OpenTransaction()) {
7372
_ = new TestEntity(nodeSession) { NodeTag = AdditionalNodeTag };
7473
_ = new TestEntity(nodeSession) { NodeTag = AdditionalNodeTag };

‎Orm/Xtensive.Orm.Tests/Storage/Multinode/QueryCachingTest.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ protected override void PopulateData()
133133
var nodes = new[] { WellKnown.DefaultNodeId, TestNodeId2, TestNodeId3 };
134134

135135
foreach(var nodeId in nodes) {
136-
var selectedNode = Domain.SelectStorageNode(nodeId);
136+
var selectedNode = Domain.StorageNodeManager.GetNode(nodeId);
137137
using (var session = selectedNode.OpenSession())
138138
using (var tx = session.OpenTransaction()) {
139139
#region Entity creation
@@ -246,7 +246,7 @@ public void TestNode3Test()
246246

247247
private void RunTestSimpleQueryTest(string nodeId)
248248
{
249-
var selectedNode = Domain.SelectStorageNode(nodeId);
249+
var selectedNode = Domain.StorageNodeManager.GetNode(nodeId);
250250
using (var session = selectedNode.OpenSession())
251251
using (var tx = session.OpenTransaction()) {
252252
var expectedTypeId = GetExpectedTypeId(nodeId);
@@ -297,7 +297,7 @@ private void RunTestSimpleQueryTest(string nodeId)
297297

298298
private void RunFilterByTypeIdQueryTest(string nodeId)
299299
{
300-
var selectedNode = Domain.SelectStorageNode(nodeId);
300+
var selectedNode = Domain.StorageNodeManager.GetNode(nodeId);
301301
using (var session = selectedNode.OpenSession())
302302
using (var tx = session.OpenTransaction()) {
303303
var expectedTypeId = GetExpectedTypeId(nodeId);
@@ -361,7 +361,7 @@ private void RunFilterByTypeIdQueryTest(string nodeId)
361361

362362
private void RunFilterBySeveralTypeIdsTest(string nodeId)
363363
{
364-
var selectedNode = Domain.SelectStorageNode(nodeId);
364+
var selectedNode = Domain.StorageNodeManager.GetNode(nodeId);
365365
using (var session = selectedNode.OpenSession())
366366
using (var tx = session.OpenTransaction()) {
367367
var expectedTypeId = GetExpectedTypeId(nodeId);

0 commit comments

Comments
 (0)