Merge pull request #593 from ApptiveGrid/asIndexKeyOfSize-interator

src/Soil-Core-Tests/SoilIndexedDictionaryTest.class.st

@@ -134,13 +134,13 @@ SoilIndexedDictionaryTest >> testAtIndexWithTransaction [
 	| tx tx2 |
 	tx := soil newTransaction.
 	tx root: dict.
-	dict at: 1 put: #one.
-	dict at: 2 put: #two.
+	dict at: #one put: #onevalue.
+	dict at: #two put: #twovalue.
 	tx commit.
 	"open a second transaction ..."
 	tx2 := soil newTransaction.
 	"and test atIndex:"
-	self assert: (tx2 root atIndex: 1) equals: #one
+	self assert: (tx2 root atIndex: 1) equals: #onevalue
 
 ]
 
@@ -233,8 +233,8 @@ SoilIndexedDictionaryTest >> testDoWithTransAction [
 
 	tx := soil newTransaction.
 	tx root: dict.
-	dict at: 1 put: #bar1.
-	dict at: 2 put: #bar2.
+	dict at: #one put: #bar1.
+	dict at: #two put: #bar2.
 	tx commit.
 	"open a second transaction ..."
 	tx1 := soil newTransaction.
@@ -246,7 +246,7 @@ SoilIndexedDictionaryTest >> testDoWithTransAction [
 		counter := counter + 1].
 	self assert: counter equals: 2.
 
-	tx2 root removeKey: 1.
+	tx2 root removeKey: #one.
 
 	counter := 0.
 	tx2 root  do: [ :each |
@@ -385,15 +385,15 @@ SoilIndexedDictionaryTest >> testIsEmpty [
 	| tx tx1 tx2 |
 	tx := soil newTransaction.
 	tx root: dict.
-	dict at: 1 put: #one.
+	dict at: #one put: #oneValue.
 	tx commit.
 	"open a second transaction ..."
 	tx1 := soil newTransaction.
 	"and test isEmpty"
 	self deny: tx1 root isEmpty.
 
 	tx2 := soil newTransaction.
-	tx2 root removeKey: 1.
+	tx2 root removeKey: #one.
 	self assert: tx2 root size equals: 0.
 	self assert: tx2 root isEmpty.
 	tx2 commit.
@@ -443,46 +443,45 @@ SoilIndexedDictionaryTest >> testLastWithTransaction [
 	| tx tx2 |
 	tx := soil newTransaction.
 	tx root: dict.
-	dict at: 2 put: #two.
-	dict at: 1 put: #one.
+	dict at: #two put: #twovalue.
+	dict at: #one put: #onevalue.
 
 	"self assert: dict last equals: #two."
 	tx commit.
 	"open a second transaction ..."
 	tx2 := soil newTransaction.
 	"and test last, note: keyorder"
-	self assert: tx2 root last equals: #two
+	self assert: tx2 root last equals: #twovalue
 ]
 
 { #category : #tests }
 SoilIndexedDictionaryTest >> testLastWithTransactionRemoveLast [
 	| tx tx2 |
 	tx := soil newTransaction.
 	tx root: dict.
-	dict at: 1 put: #one.
-	dict at: 2 put: #two.
+	dict at: #one put: #onevalue.
+	dict at: #two put: #twovalue.
 	"self assert: dict last equals: #two."
 	tx commit.
 	"open a second transaction ..."
 	tx2 := soil newTransaction.
-	tx2 root removeKey: 2.
+	tx2 root removeKey: #two.
 	"and test last"
-	self assert: tx2 root last equals: #one
+	self assert: tx2 root last equals: #onevalue
 ]
 
 { #category : #tests }
 SoilIndexedDictionaryTest >> testNextAssociationAfterWithTransaction [
 	| tx tx2 |
 	tx := soil newTransaction.
 	tx root: dict.
-	dict at: 1 put: #one.
-	dict at: 2 put: #two.
-	"self assert: dict last equals: #two."
+	dict at: #one put: #onevalue.
+	dict at: #two put: #twovalue.
 	tx commit.
 	"open a second transaction ..."
 	tx2 := soil newTransaction.
 	"and test last"
-	self assert: (tx2 root nextAssociationAfter: 1) value equals: #two
+	self assert: (tx2 root nextAssociationAfter: #one) value equals: #twovalue
 ]
 
 { #category : #tests }
@@ -507,22 +506,21 @@ SoilIndexedDictionaryTest >> testRemoveKeyIfAbsentWithTransaction [
 	| tx tx2 tag |
 	tx := soil newTransaction.
 	tx root: dict.
-	dict at: 1 put: #one.
-	dict at: 2 put: #two.
-	"self assert: dict last equals: #two."
+	dict at: #one put: #onevalue.
+	dict at: #two put: #twovalue.
 	tx commit.
 	"open a second transaction ..."
 	tx2 := soil newTransaction.
 	"remove the key"
-	tx2 root removeKey: 2.
+	tx2 root removeKey: #two.
 	self assert: tx2 root size equals: 1.
 	"remove again to test absent case"
 	tag := false.
-	tx2 root removeKey: 3 ifAbsent: [ tag := true ].
+	tx2 root removeKey: #three ifAbsent: [ tag := true ].
 	self assert: tag.
 	"remove again to test absent case with already removed key"
 	tag := false.
-	tx2 root removeKey: 2 ifAbsent: [ tag := true ].
+	tx2 root removeKey: #two ifAbsent: [ tag := true ].
 	self assert: tag.
 
 
@@ -537,19 +535,19 @@ SoilIndexedDictionaryTest >> testRemoveKeyWithTwoTransactions [
 	self skip.
 	tx := soil newTransaction.
 	tx root: dict.
-	dict at: 1 put: #one.
-	dict at: 2 put: #two.
+	dict at: #one put: #onevalue.
+	dict at: #two put: #twovalue.
 	tx commit.
 	"we create two transactions"
 	tx := soil newTransaction.
 	tx2 := soil newTransaction.
 	"remove the key"
-	tx2 root removeKey: 2.
+	tx2 root removeKey: #two.
 	tx2 commit.
 	"check that we can still see in the first tr"
-	self assert: (tx root at: 2) equals: #two.
+	self assert: (tx root at: #two) equals: #twovalue.
 	"but removeKey: does not see it, we can remove it without error"
-	tx root removeKey: 2 ifAbsent: [ self fail ].
+	tx root removeKey: #two ifAbsent: [ self fail ].
 	self assert: tx root size equals: 1.
 	"but commiting it will fail, as we have commited the remove in t2"
 	self should: [tx commit] raise: SoilObjectHasConcurrentChange
@@ -560,24 +558,22 @@ SoilIndexedDictionaryTest >> testSecondWithTransaction [
 	| tx tx2 |
 	tx := soil newTransaction.
 	tx root: dict.
-	dict at: 1 put: #one.
-	dict at: 2 put: #two.
-	"self assert: dict last equals: #two."
+	dict at: #one put: #onevalue.
+	dict at: #two put: #twovalue.
 	tx commit.
 	"open a second transaction ..."
 	tx2 := soil newTransaction.
 	"and test last"
-	self assert: tx2 root second equals: #two
+	self assert: tx2 root second equals: #twovalue
 ]
 
 { #category : #tests }
 SoilIndexedDictionaryTest >> testSizeWithTransaction [
 	| tx tx2 |
 	tx := soil newTransaction.
 	tx root: dict.
-	dict at: 1 put: #one.
-	dict at: 2 put: #two.
-	"self assert: dict last equals: #two."
+	dict at: #one put: #onevalue.
+	dict at: #two put: #twovalue.
 	tx commit.
 	"open a second transaction ..."
 	tx2 := soil newTransaction.
@@ -590,14 +586,13 @@ SoilIndexedDictionaryTest >> testValuesWithTransaction [
 	| tx tx2 |
 	tx := soil newTransaction.
 	tx root: dict.
-	dict at: 1 put: #one.
-	dict at: 2 put: #two.
-	"self assert: dict last equals: #two."
+	dict at: #one put: #onevalue.
+	dict at: #two put: #twovalue.
 	tx commit.
 	"open a second transaction ..."
 	tx2 := soil newTransaction.
 	"and test last"
 	self assert: tx2 root values size equals: 2.
-	self assert: (tx2 root values includes: #one).
-	self assert: (tx2 root values includes: #two)
+	self assert: (tx2 root values includes: #onevalue).
+	self assert: (tx2 root values includes: #twovalue)
 ]

src/Soil-Core/SoilBTreeIterator.class.st

@@ -13,8 +13,8 @@ SoilBTreeIterator >> basicAt: key put: anObject [
 ]
 
 { #category : #private }
-SoilBTreeIterator >> findPageFor: key [
-	^currentPage := index rootPage find: key with: index
+SoilBTreeIterator >> findPageFor: binKey [
+	^currentPage := index rootPage find: binKey with: index
 ]
 
 { #category : #accessing }

src/Soil-Core/SoilBasicBTree.class.st

@@ -100,18 +100,6 @@ SoilBasicBTree >> readPageFrom: aStream [
 	^ SoilBTreePage readPageFrom: aStream keySize: self keySize valueSize: self valueSize
 ]
 
-{ #category : #removing }
-SoilBasicBTree >> removeKey: aString ifAbsent: aBlock [
-	| page index key |
-	key := (aString asIndexKeyOfSize: self keySize) asInteger.
-	page := self newIterator 
-		find: key;
-		currentPage.
-	^ ((index := page indexOfKey: key) > 0) 
-		ifTrue: [ (page itemRemoveIndex: index) value ]
-		ifFalse: [ aBlock value ]
-]
-
 { #category : #accessing }
 SoilBasicBTree >> rootPage [
 	^ self store pageAt: 2

src/Soil-Core/SoilBasicSkipList.class.st

@@ -27,18 +27,6 @@ SoilBasicSkipList >> newIterator [
 	^ SoilSkipListIterator on: self 
 ]
 
-{ #category : #removing }
-SoilBasicSkipList >> removeKey: aString ifAbsent: aBlock [
-	| page index key |
-	key := (aString asIndexKeyOfSize: self keySize) asInteger.
-	page := self newIterator 
-		find: key;
-		currentPage.
-	^ ((index := page indexOfKey: key) > 0) 
-		ifTrue: [ (page itemRemoveIndex: index) value ]
-		ifFalse: [ aBlock value ]
-]
-
 { #category : #private }
 SoilBasicSkipList >> splitPage: aIterator forKey: aKey [
 	| newPage page |

src/Soil-Core/SoilIndex.class.st

@@ -52,9 +52,9 @@ SoilIndex >> do: aBlock [
 ]
 
 { #category : #private }
-SoilIndex >> find: aString [ 
+SoilIndex >> find: key [ 
 	^ self newIterator 
-		find: (aString asIndexKeyOfSize: self keySize) asInteger
+		find: key
 ]
 
 { #category : #accessing }
@@ -172,8 +172,14 @@ SoilIndex >> removeKey: key [
 ]
 
 { #category : #'instance creation' }
-SoilIndex >> removeKey: aString ifAbsent: aBlock [
-	^ self subclassResponsibility
+SoilIndex >> removeKey: key ifAbsent: aBlock [
+	| page index |
+	page := self newIterator 
+		find: key;
+		currentPage.
+	^ ((index := page indexOfKey: (key asIndexKeyOfSize: self keySize) asInteger) > 0) 
+		ifTrue: [ (page itemRemoveIndex: index) value ]
+		ifFalse: [ aBlock value ]
 ]
 
 { #category : #accessing }

src/Soil-Core/SoilIndexIterator.class.st

@@ -41,8 +41,7 @@ SoilIndexIterator >> at: aKeyObject [
 { #category : #accessing }
 SoilIndexIterator >> at: aKeyObject ifAbsent: aBlock [
 	| foundValue |
-	currentKey := (aKeyObject asIndexKeyOfSize: index keySize) asInteger.
-	foundValue := self find: currentKey ifAbsent: aBlock.
+	foundValue := self find: aKeyObject ifAbsent: aBlock.
  	^(self restoreValue: foundValue forKey: currentKey) ifNil: [ aBlock value ]
 ]
 
@@ -137,13 +136,13 @@ SoilIndexIterator >> find: key [
 
 { #category : #private }
 SoilIndexIterator >> find: key ifAbsent: aBlock [
-	currentKey := key.
-	self findPageFor: key.
-	^ currentPage valueAt: key ifAbsent: aBlock
+	currentKey := (key asIndexKeyOfSize: index keySize) asInteger.
+	self findPageFor: currentKey.
+	^ currentPage valueAt: currentKey ifAbsent: aBlock
 ]
 
 { #category : #private }
-SoilIndexIterator >> findPageFor: key [ 
+SoilIndexIterator >> findPageFor: binKey [ 
 	^ self subclassResponsibility
 ]
 
@@ -279,7 +278,7 @@ SoilIndexIterator >> nextAssociation [
 { #category : #accessing }
 SoilIndexIterator >> nextAssociationAfter: key [
 
-	self find: (key asIndexKeyOfSize: index keySize) asInteger.
+	self find: key.
 	^ self nextAssociation
 ]
 

src/Soil-Core/SoilSkipListIterator.class.st

@@ -33,15 +33,15 @@ SoilSkipListIterator >> basicAt: key put: anObject [
 ]
 
 { #category : #private }
-SoilSkipListIterator >> findPageFor: key [
+SoilSkipListIterator >> findPageFor: binKey [
 	| pageIndex candidatePage |
 	currentPage := index headerPage.
 	levels size to: 1 by: -1 do: [ :level |
 		[ 
 			pageIndex := currentPage rightAt: level.
 			(pageIndex > 0) and: [ 
 				candidatePage := self pageAt: pageIndex.
-				candidatePage smallestKey <= key ] ]
+				candidatePage smallestKey <= binKey ] ]
 					whileTrue: [ currentPage := candidatePage  ].
 			self atLevel: level put: currentPage. ].
 	^ currentPage