Skip to content

Commit 6461b29

Browse files
dalehenrichdalehenrich
committed
Issue #20: adjust SequenceableCollection >> readStream patch to be performed by seaside user; also need String >> readStream patch
1 parent 893077f commit 6461b29

File tree

10 files changed

+96
-20
lines changed

10 files changed

+96
-20
lines changed

‎filetree/GsDevKit_upgrade-Common.package/GsuAbstractGemStoneRelease.class/instance/prepareGsDevKitImage_patch49622..st

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
prepare gsdevkit image
2+
prepareGsDevKitImage_patch49622: aGsDevKitUpgrade
3+
aGsDevKitUpgrade prepareGsDevKitImage_bug49622_patch

‎filetree/GsDevKit_upgrade-Common.package/GsuGemStone_3_7_x_Release.class/instance/prepareGsDevKitImage_patch49622..st

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
prepare gsdevkit image
2+
prepareGsDevKitImage_patch49622: aGsDevKitUpgrade
3+
"noop for upgrades from 3.7.0 or later"

‎filetree/GsDevKit_upgrade-Core.package/GsuAbstractGsDevKitUpgrade.class/instance/prepareGsDevKitImage.st

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ prepareGsDevKitImage
2525
prepareGsDevKitImage_patch46217: self;
2626
prepareGsDevKitImage_patch_compileMethodCategory: self;
2727
prepareGsDevKitImage_recompilePragmaMethods: self;
28+
prepareGsDevKitImage_patch49622: self;
2829
prepareGsDevKitImage_bootstrapGsDevkit: self;
2930
prepareGsDevKitImage_resetExistingGlobalState: self;
3031
yourself.

‎filetree/GsDevKit_upgrade-Core.package/GsuAbstractGsDevKitUpgrade.class/instance/prepareGsDevKitImage_bug49622_patch.st

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
prepare gsdevkit image
2+
prepareGsDevKitImage_bug49622_patch
3+
"Bug 49622 - starting in 3.7.0 ReadByteStream an optimized version of ReadStream should be used
4+
in GLASS applications instead of AnsiReadStream in subclasses of SequenceableCollection"
5+
6+
"noop for pre-3.7.0 upgrades"

‎filetree/GsDevKit_upgrade-Core.package/GsuGsDevKit_3_7_x_Upgrade.class/instance/prepareGsDevKitImage_bug49622_patch.st

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
prepare gsdevkit image
2+
prepareGsDevKitImage_bug49622_patch
3+
"Bug 49622 - starting in 3.7.0 ReadByteStream an optimized version of ReadStream should be used
4+
in GLASS applications instead of AnsiReadStream in SequenceableCollection snf String"
5+
6+
| category |
7+
category := #'49622 patch'.
8+
self timeStampedLog: 'Prepare gsdevkit - patch 49622'.
9+
10+
(SequenceableCollection
11+
compileMethod: 'readStream ^ AnsiReadStream on: self'
12+
dictionaries: self upgradeUserProfile symbolList
13+
category: category) ifNotNil: [ :ar | self error: 'did not compile' ].
14+
15+
(String
16+
compileMethod: 'readStream ^ AnsiReadStream on: self'
17+
dictionaries: self upgradeUserProfile symbolList
18+
category: category) ifNotNil: [ :ar | self error: 'did not compile' ].

‎gemstone/GsDevKit_upgrade.gs

+34-10
Original file line numberDiff line numberDiff line change
@@ -649,6 +649,12 @@ prepareGsDevKitImage_patch46217: aGsDevKitUpgrade
649649
aGsDevKitUpgrade prepareGsDevKitImage_bug46217_patch
650650
%
651651

652+
category: 'prepare gsdevkit image'
653+
method: GsuAbstractGemStoneRelease
654+
prepareGsDevKitImage_patch49622: aGsDevKitUpgrade
655+
aGsDevKitUpgrade prepareGsDevKitImage_bug49622_patch
656+
%
657+
652658
category: 'prepare gsdevkit image'
653659
method: GsuAbstractGemStoneRelease
654660
prepareGsDevKitImage_patch_compileMethodCategory: aGsDevKitUpgrade
@@ -1377,6 +1383,12 @@ minor
13771383
^ minor ifNil: [ 7]
13781384
%
13791385

1386+
category: 'prepare gsdevkit image'
1387+
method: GsuGemStone_3_7_x_Release
1388+
prepareGsDevKitImage_patch49622: aGsDevKitUpgrade
1389+
"noop for upgrades from 3.7.0 or later"
1390+
%
1391+
13801392
category: 'bootstrapping'
13811393
method: GsuGemStone_3_7_x_Release
13821394
reloadBootstrapPackageFileNames
@@ -2287,6 +2299,7 @@ prepareGsDevKitImage
22872299
prepareGsDevKitImage_patch46217: self;
22882300
prepareGsDevKitImage_patch_compileMethodCategory: self;
22892301
prepareGsDevKitImage_recompilePragmaMethods: self;
2302+
prepareGsDevKitImage_patch49622: self;
22902303
prepareGsDevKitImage_bootstrapGsDevkit: self;
22912304
prepareGsDevKitImage_resetExistingGlobalState: self;
22922305
yourself.
@@ -2350,6 +2363,15 @@ prepareGsDevKitImage_bug46217_patch
23502363
self log: ' 46217 patched (commit)'.
23512364
%
23522365

2366+
category: 'prepare gsdevkit image'
2367+
method: GsuAbstractGsDevKitUpgrade
2368+
prepareGsDevKitImage_bug49622_patch
2369+
"Bug 49622 - starting in 3.7.0 ReadByteStream an optimized version of ReadStream should be used
2370+
in GLASS applications instead of AnsiReadStream in subclasses of SequenceableCollection"
2371+
2372+
"noop for pre-3.7.0 upgrades"
2373+
%
2374+
23532375
category: 'prepare gsdevkit image'
23542376
method: GsuAbstractGsDevKitUpgrade
23552377
prepareGsDevKitImage_clearMetacelloCaches
@@ -3847,23 +3869,25 @@ _prepareImage_class__mcDefinitionType_source
38473869

38483870
! Instance methods for 'GsuGsDevKit_3_7_x_Upgrade'
38493871

3850-
category: 'prepare image'
3872+
category: 'prepare gsdevkit image'
38513873
method: GsuGsDevKit_3_7_x_Upgrade
3852-
prepareImage_patches
3853-
"need to arrange for SequenceableCollection>>readStream to return an AnsiReadStream "
3874+
prepareGsDevKitImage_bug49622_patch
3875+
"Bug 49622 - starting in 3.7.0 ReadByteStream an optimized version of ReadStream should be used
3876+
in GLASS applications instead of AnsiReadStream in SequenceableCollection snf String"
38543877

38553878
| category |
3856-
category := #'49622 experiment'.
3857-
super prepareImage_patches.
3879+
category := #'49622 patch'.
3880+
self timeStampedLog: 'Prepare gsdevkit - patch 49622'.
38583881

3859-
self
3860-
timeStampedLog:
3861-
' patch SequenceableCollection >> readStream in category '
3862-
, category asString printString , ' as ' , System myUserProfile userId.
38633882
(SequenceableCollection
38643883
compileMethod: 'readStream ^ AnsiReadStream on: self'
38653884
dictionaries: self upgradeUserProfile symbolList
3866-
category: category) ifNotNil: [ :ar | self error: 'did not compile' ]
3885+
category: category) ifNotNil: [ :ar | self error: 'did not compile' ].
3886+
3887+
(String
3888+
compileMethod: 'readStream ^ AnsiReadStream on: self'
3889+
dictionaries: self upgradeUserProfile symbolList
3890+
category: category) ifNotNil: [ :ar | self error: 'did not compile' ].
38673891
%
38683892

38693893
category: 'private'

‎rowan/src/GsDevKit_upgrade-Common/GsuAbstractGemStoneRelease.class.st

+5
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,11 @@ GsuAbstractGemStoneRelease >> prepareGsDevKitImage_patch46217: aGsDevKitUpgrade
232232
aGsDevKitUpgrade prepareGsDevKitImage_bug46217_patch
233233
]
234234

235+
{ #category : 'prepare gsdevkit image' }
236+
GsuAbstractGemStoneRelease >> prepareGsDevKitImage_patch49622: aGsDevKitUpgrade [
237+
aGsDevKitUpgrade prepareGsDevKitImage_bug49622_patch
238+
]
239+
235240
{ #category : 'prepare gsdevkit image' }
236241
GsuAbstractGemStoneRelease >> prepareGsDevKitImage_recompilePragmaMethods: aGsDevKitUpgrade [
237242

‎rowan/src/GsDevKit_upgrade-Common/GsuGemStone_3_7_x_Release.class.st

+5
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ GsuGemStone_3_7_x_Release >> minor [
1010
^ minor ifNil: [ 7]
1111
]
1212

13+
{ #category : 'prepare gsdevkit image' }
14+
GsuGemStone_3_7_x_Release >> prepareGsDevKitImage_patch49622: aGsDevKitUpgrade [
15+
"noop for upgrades from 3.7.0 or later"
16+
]
17+
1318
{ #category : 'bootstrapping' }
1419
GsuGemStone_3_7_x_Release >> reloadBootstrapPackageFileNames [
1520
"answer an ordered list of the Monticello packages that are needed to reload GLASS into image"

‎rowan/src/GsDevKit_upgrade-Core/GsuAbstractGsDevKitUpgrade.class.st

+9
Original file line numberDiff line numberDiff line change
@@ -476,6 +476,7 @@ GsuAbstractGsDevKitUpgrade >> prepareGsDevKitImage [
476476
prepareGsDevKitImage_patch46217: self;
477477
prepareGsDevKitImage_patch_compileMethodCategory: self;
478478
prepareGsDevKitImage_recompilePragmaMethods: self;
479+
prepareGsDevKitImage_patch49622: self;
479480
prepareGsDevKitImage_bootstrapGsDevkit: self;
480481
prepareGsDevKitImage_resetExistingGlobalState: self;
481482
yourself.
@@ -523,6 +524,14 @@ GsuAbstractGsDevKitUpgrade >> prepareGsDevKitImage_bug46217_patch [
523524
self log: ' 46217 patched (commit)'.
524525
]
525526

527+
{ #category : 'prepare gsdevkit image' }
528+
GsuAbstractGsDevKitUpgrade >> prepareGsDevKitImage_bug49622_patch [
529+
"Bug 49622 - starting in 3.7.0 ReadByteStream an optimized version of ReadStream should be used
530+
in GLASS applications instead of AnsiReadStream in subclasses of SequenceableCollection"
531+
532+
"noop for pre-3.7.0 upgrades"
533+
]
534+
526535
{ #category : 'prepare gsdevkit image' }
527536
GsuAbstractGsDevKitUpgrade >> prepareGsDevKitImage_clearMetacelloCaches [
528537

‎rowan/src/GsDevKit_upgrade-Core/GsuGsDevKit_3_7_x_Upgrade.class.st

+12-10
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,22 @@ GsuGsDevKit_3_7_x_Upgrade >> _defaultTargetRelease [
1010
^ GsuGemStone_3_7_x_Release major: 3 minor: 7 patch: self _patchRelease
1111
]
1212

13-
{ #category : 'prepare image' }
14-
GsuGsDevKit_3_7_x_Upgrade >> prepareImage_patches [
15-
"need to arrange for SequenceableCollection>>readStream to return an AnsiReadStream "
13+
{ #category : 'prepare gsdevkit image' }
14+
GsuGsDevKit_3_7_x_Upgrade >> prepareGsDevKitImage_bug49622_patch [
15+
"Bug 49622 - starting in 3.7.0 ReadByteStream an optimized version of ReadStream should be used
16+
in GLASS applications instead of AnsiReadStream in SequenceableCollection snf String"
1617

1718
| category |
18-
category := #'49622 experiment'.
19-
super prepareImage_patches.
19+
category := #'49622 patch'.
20+
self timeStampedLog: 'Prepare gsdevkit - patch 49622'.
2021

21-
self
22-
timeStampedLog:
23-
' patch SequenceableCollection >> readStream in category '
24-
, category asString printString , ' as ' , System myUserProfile userId.
2522
(SequenceableCollection
2623
compileMethod: 'readStream ^ AnsiReadStream on: self'
2724
dictionaries: self upgradeUserProfile symbolList
28-
category: category) ifNotNil: [ :ar | self error: 'did not compile' ]
25+
category: category) ifNotNil: [ :ar | self error: 'did not compile' ].
26+
27+
(String
28+
compileMethod: 'readStream ^ AnsiReadStream on: self'
29+
dictionaries: self upgradeUserProfile symbolList
30+
category: category) ifNotNil: [ :ar | self error: 'did not compile' ].
2931
]

0 commit comments

Comments
 (0)