Enable lazy stream opening in index page store

file streams are not opened at materialization time anymore. Indexes are created but streams are opened lazily on first usage
ApptiveGrid · Dec 7, 2023 · 8de7a5a · 8de7a5a
1 parent d7995e3
commit 8de7a5a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/src/Soil-Core/SoilIndexManager.class.st b/src/Soil-Core/SoilIndexManager.class.st
@@ -98,8 +98,7 @@ SoilIndexManager >> loadIndexWithId: indexId ifNone: aBlock [
 	^ path exists
 		ifTrue: [ 
 			(self class indexClassFromFile: path) new 
-				path: path;
-				open ]
+				path: path ]
 		ifFalse: [ aBlock value ]
 ]
 

diff --git a/src/Soil-Core/SoilPagedFileIndexStore.class.st b/src/Soil-Core/SoilPagedFileIndexStore.class.st
@@ -26,6 +26,13 @@ SoilPagedFileIndexStore >> close [
 		stream := nil ]
 ]
 
+{ #category : #accessing }
+SoilPagedFileIndexStore >> ensureStreamIsOpen [
+	stream ifNotNil: [ ^ self ].
+	self open
+
+]
+
 { #category : #'instance creation' }
 SoilPagedFileIndexStore >> filePageSize [
 	"most OSses use a file page size of 4k today"
@@ -71,9 +78,10 @@ SoilPagedFileIndexStore >> initializeHeaderPage [
 
 { #category : #'open/close' }
 SoilPagedFileIndexStore >> open [
-	self 
-		openStream;
-		readHeaderPage 
+	streamSemaphore critical: [  
+		self 
+			openStream;
+			readHeaderPage ]
 ]
 
 { #category : #'open/close' }
@@ -84,6 +92,7 @@ SoilPagedFileIndexStore >> openStream [
 { #category : #accessing }
 SoilPagedFileIndexStore >> pageFaultAt: anInteger [
 	| page |
+	self ensureStreamIsOpen.
 	streamSemaphore critical: [  
 		stream position: (self positionOfPageIndex: anInteger).
 		page := (index readPageFrom: stream) index: anInteger ].
@@ -105,10 +114,9 @@ SoilPagedFileIndexStore >> positionOfPageIndex: anInteger [
 { #category : #writing }
 SoilPagedFileIndexStore >> readHeaderPage [
 	| headerPage |
-	streamSemaphore critical: [  
-		stream position: 0.
-		stream next. "pageCode"
-		headerPage :=  index newHeaderPage readFrom: stream ].
+	stream position: 0.
+	stream next. "pageCode"
+	headerPage :=  index newHeaderPage readFrom: stream.
 	pagesMutex critical: [  
 		pages at: 1 put: headerPage ]
 ]
@@ -128,8 +136,9 @@ SoilPagedFileIndexStore >> stream [
 
 { #category : #writing }
 SoilPagedFileIndexStore >> writePage: aPage [ 
+	| pagePosition |
+	self ensureStreamIsOpen.
 	streamSemaphore critical: [  
-		| pagePosition |
 		pagePosition := self positionOfPageIndex: aPage index.  
 		stream position: pagePosition.
 		aPage writeOn: stream.