Merge pull request #70 from ba-st/66-Allow-to-configure-session-pool

Make configurable session pooling options
ba-st · Dec 16, 2021 · 92d9d93 · 92d9d93
2 parents 9aeaa93 + bdb0c61
commit 92d9d93
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 13 deletions.
diff --git a/docs/Getting-started.md b/docs/Getting-started.md
@@ -41,7 +41,13 @@ There is 3 different ways of instantiating a provider:
 
 - `InMemoryRepositoryProvider new`
 - `RDBMSRepositoryProvider usingSingleSessionWith: aLogin`
-- `RDBMSRepositoryProvider using: aLogin`
+- `RDBMSRepositoryProvider usingSessionPoolWith: aLogin configuredBy: configurationAction`.
+
+Valid options for the session pooling configuration are:
+
+- `maxIdleSessionsCount` defaulting to 10
+- `minIdleSessionsCount` defaulting to 5
+- `maxActiveSessionsCount` defaulting to 12
 
 Concretely, the complete algorithm to start a project with persistence using
 Sagan is:

diff --git a/source/Sagan-RDBMS-Tests/PooledRDBMSRepositoryProviderTest.class.st b/source/Sagan-RDBMS-Tests/PooledRDBMSRepositoryProviderTest.class.st
@@ -137,7 +137,14 @@ PooledRDBMSRepositoryProviderTest >> setUp [
 { #category : #initialization }
 PooledRDBMSRepositoryProviderTest >> setUpRepositoryWith: aConflictCheckingStrategy [
 
-	provider := RDBMSRepositoryProvider using: SingleSessionRDMBSRepositoryTest login.
+	provider := RDBMSRepositoryProvider
+		            usingSessionPoolWith:
+		            SingleSessionRDMBSRepositoryTest login
+		            configuredBy: [ :options | 
+			            options
+				            at: #maxIdleSessionsCount put: 8;
+				            at: #minIdleSessionsCount put: 4;
+				            at: #maxActiveSessionsCount put: 10 ].
 	extraterrestrials := provider
 		createRepositoryStoringObjectsOfType: Extraterrestrial
 		checkingConflictsAccordingTo: aConflictCheckingStrategy.

diff --git a/source/Sagan-RDBMS/PooledRDBMSSessionProvider.class.st b/source/Sagan-RDBMS/PooledRDBMSSessionProvider.class.st
@@ -13,9 +13,12 @@ Class {
 }
 
 { #category : #'instance creation' }
-PooledRDBMSSessionProvider class >> loginWith: aLogin [ 
+PooledRDBMSSessionProvider class >> loginWith: aLogin configuredBy: aBlock [
 
-	^ self new initializeLoginWith: aLogin
+	| options |
+	options := Dictionary new.
+	aBlock cull: options.
+	^ self new initializeLoginWith: aLogin configuredBy: options
 ]
 
 { #category : #'private-accessing' }
@@ -73,17 +76,17 @@ PooledRDBMSSessionProvider >> initializeConfigurationSession [
 ]
 
 { #category : #initialization }
-PooledRDBMSSessionProvider >> initializeLoginWith: aLogin [
+PooledRDBMSSessionProvider >> initializeLoginWith: aLogin configuredBy: options [
 
 	login := aLogin.
 	descriptorSystem := ConfigurableDescriptorSystem new.
 	descriptorSystemWasCopied := false.
 	self initializeConfigurationSession.
-	self initializeWorkingSessionsPool
+	self initializeWorkingSessionsPoolConfiguredBy: options
 ]
 
 { #category : #initialization }
-PooledRDBMSSessionProvider >> initializeWorkingSessionsPool [
+PooledRDBMSSessionProvider >> initializeWorkingSessionsPoolConfiguredBy: options [
 
 	descriptorsBySession := Dictionary new.
 	sessionPool := OPBasicPool new.
@@ -93,9 +96,9 @@ PooledRDBMSSessionProvider >> initializeWorkingSessionsPool [
 		validator: #isLoggedIn;
 		passivator: #reset;
 		activator: [ :session | self configureDescriptorSystemTo: session ];
-		maxIdleObjects: 10;
-		minIdleObjects: 5;
-		maxActiveObjects: 12
+		maxIdleObjects: (options at: #maxIdleSessionsCount ifAbsent: [ 10 ]);
+		minIdleObjects: (options at: #minIdleSessionsCount ifAbsent: [ 5 ]);
+		maxActiveObjects: (options at: #maxActiveSessionsCount ifAbsent: [ 12 ])
 ]
 
 { #category : #accessing }

diff --git a/source/Sagan-RDBMS/RDBMSMappingConfiguration.class.st b/source/Sagan-RDBMS/RDBMSMappingConfiguration.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #RDBMSMappingConfiguration,
 	#superclass : #Object,
-	#category : #'Sagan-RDBMS'
+	#category : #'Sagan-RDBMS-Mappings'
 }
 
 { #category : #applying }

diff --git a/source/Sagan-RDBMS/RDBMSRepositoryProvider.class.st b/source/Sagan-RDBMS/RDBMSRepositoryProvider.class.st
@@ -17,9 +17,11 @@ RDBMSRepositoryProvider class >> obtainingSessionFrom: aSessionProvider [
 ]
 
 { #category : #'instance creation' }
-RDBMSRepositoryProvider class >> using: aLogin [
+RDBMSRepositoryProvider class >> usingSessionPoolWith: aLogin configuredBy: configurationAction [
 
-	^ self obtainingSessionFrom: ( PooledRDBMSSessionProvider loginWith: aLogin )
+	^ self obtainingSessionFrom: (PooledRDBMSSessionProvider
+			   loginWith: aLogin
+			   configuredBy: configurationAction)
 ]
 
 { #category : #'instance creation' }