Skip to content

Commit 4b2a5ae

Browse files
gavinkinggavinking
committed
rename all 'ck' to 'cacheKey'
1 parent 86a274d commit 4b2a5ae

File tree

10 files changed

+121
-109
lines changed

10 files changed

+121
-109
lines changed

‎hibernate-core/src/main/java/org/hibernate/action/internal/CollectionAction.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,13 @@ public final void beforeExecutions() throws CacheException {
7373
// the database. This action is responsible for second-level cache invalidation only.
7474
if ( persister.hasCache() ) {
7575
final var cache = persister.getCacheAccessStrategy();
76-
final Object ck = cache.generateCacheKey(
76+
final Object cacheKey = cache.generateCacheKey(
7777
key,
7878
persister,
7979
session.getFactory(),
8080
session.getTenantIdentifier()
8181
);
82-
final SoftLock lock = cache.lockItem( session, ck, null );
82+
final SoftLock lock = cache.lockItem( session, cacheKey, null );
8383
// the old behavior used key as opposed to getKey()
8484
afterTransactionProcess = new CacheCleanupProcess( key, persister, lock );
8585
}
@@ -129,13 +129,13 @@ protected final EventSource getSession() {
129129
protected final void evict() throws CacheException {
130130
if ( persister.hasCache() ) {
131131
final var cache = persister.getCacheAccessStrategy();
132-
final Object ck = cache.generateCacheKey(
132+
final Object cacheKey = cache.generateCacheKey(
133133
key,
134134
persister,
135135
session.getFactory(),
136136
session.getTenantIdentifier()
137137
);
138-
cache.remove( session, ck);
138+
cache.remove( session, cacheKey);
139139
}
140140
}
141141

@@ -170,13 +170,13 @@ private CacheCleanupProcess(Object key, CollectionPersister persister, SoftLock
170170
@Override
171171
public void doAfterTransactionCompletion(boolean success, SharedSessionContractImplementor session) {
172172
final var cache = persister.getCacheAccessStrategy();
173-
final Object ck = cache.generateCacheKey(
173+
final Object cacheKey = cache.generateCacheKey(
174174
key,
175175
persister,
176176
session.getFactory(),
177177
session.getTenantIdentifier()
178178
);
179-
cache.unlockItem( session, ck, lock );
179+
cache.unlockItem( session, cacheKey, lock );
180180
}
181181
}
182182

‎hibernate-core/src/main/java/org/hibernate/action/internal/EntityDeleteAction.java‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public void execute() throws HibernateException {
109109

110110
handleNaturalIdLocalResolutions( persister, session.getPersistenceContextInternal() );
111111

112-
final Object ck = lockCacheItem();
112+
final Object cacheKey = lockCacheItem();
113113

114114
if ( !isCascadeDeleteEnabled && !veto ) {
115115
final var eventMonitor = session.getEventMonitor();
@@ -125,11 +125,11 @@ public void execute() throws HibernateException {
125125
}
126126

127127
if ( isInstanceLoaded() ) {
128-
postDeleteLoaded( id, persister, session, instance, ck );
128+
postDeleteLoaded( id, persister, session, instance, cacheKey );
129129
}
130130
else {
131131
// we're deleting an unloaded proxy
132-
postDeleteUnloaded( id, persister, session, ck );
132+
postDeleteUnloaded( id, persister, session, cacheKey );
133133
}
134134

135135
final var statistics = session.getFactory().getStatistics();
@@ -167,7 +167,7 @@ protected void postDeleteLoaded(
167167
EntityPersister persister,
168168
SharedSessionContractImplementor session,
169169
Object instance,
170-
Object ck) {
170+
Object cacheKey) {
171171
// After actually deleting a row, record the fact that the instance no longer
172172
// exists on the database (needed for identity-column key generation), and
173173
// remove it from the session cache
@@ -179,20 +179,24 @@ protected void postDeleteLoaded(
179179
entry.postDelete();
180180
final var key = entry.getEntityKey();
181181
persistenceContext.removeEntityHolder( key );
182-
removeCacheItem( ck );
182+
removeCacheItem( cacheKey );
183183
persistenceContext.getNaturalIdResolutions()
184184
.removeSharedResolution( id, naturalIdValues, persister, true );
185185
postDelete();
186186
}
187187

188-
protected void postDeleteUnloaded(Object id, EntityPersister persister, SharedSessionContractImplementor session, Object ck) {
188+
protected void postDeleteUnloaded(
189+
Object id,
190+
EntityPersister persister,
191+
SharedSessionContractImplementor session,
192+
Object cacheKey) {
189193
final var persistenceContext = session.getPersistenceContextInternal();
190194
final var key = session.generateEntityKey( id, persister );
191195
if ( !persistenceContext.containsDeletedUnloadedEntityKey( key ) ) {
192196
throw new AssertionFailure( "deleted proxy should be for an unloaded entity: " + key );
193197
}
194198
persistenceContext.removeProxy( key );
195-
removeCacheItem( ck );
199+
removeCacheItem( cacheKey );
196200
}
197201

198202
protected boolean preDelete() {
@@ -261,14 +265,14 @@ protected Object lockCacheItem() {
261265
if ( persister.canWriteToCache() ) {
262266
final var cache = persister.getCacheAccessStrategy();
263267
final var session = getSession();
264-
final Object ck = cache.generateCacheKey(
268+
final Object cacheKey = cache.generateCacheKey(
265269
getId(),
266270
persister,
267271
session.getFactory(),
268272
session.getTenantIdentifier()
269273
);
270-
lock = cache.lockItem( session, ck, getCurrentVersion() );
271-
return ck;
274+
lock = cache.lockItem( session, cacheKey, getCurrentVersion() );
275+
return cacheKey;
272276
}
273277
else {
274278
return null;
@@ -280,21 +284,21 @@ protected void unlockCacheItem() {
280284
if ( persister.canWriteToCache() ) {
281285
final var cache = persister.getCacheAccessStrategy();
282286
final var session = getSession();
283-
final Object ck = cache.generateCacheKey(
287+
final Object cacheKey = cache.generateCacheKey(
284288
getId(),
285289
persister,
286290
session.getFactory(),
287291
session.getTenantIdentifier()
288292
);
289-
cache.unlockItem( session, ck, lock );
293+
cache.unlockItem( session, cacheKey, lock );
290294
}
291295
}
292296

293-
protected void removeCacheItem(Object ck) {
297+
protected void removeCacheItem(Object cacheKey) {
294298
final var persister = getPersister();
295299
if ( persister.canWriteToCache() ) {
296300
final var cache = persister.getCacheAccessStrategy();
297-
cache.remove( getSession(), ck );
301+
cache.remove( getSession(), cacheKey );
298302

299303
final var statistics = getSession().getFactory().getStatistics();
300304
if ( statistics.isStatisticsEnabled() ) {

‎hibernate-core/src/main/java/org/hibernate/action/internal/EntityInsertAction.java‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ protected void putCacheIfNecessary() {
165165
final var factory = session.getFactory();
166166
cacheEntry = buildStructuredCacheEntry();
167167
final var cache = persister.getCacheAccessStrategy();
168-
final Object ck = cache.generateCacheKey( getId(), persister, factory, session.getTenantIdentifier() );
169-
final boolean put = cacheInsert( persister, ck );
168+
final Object cacheKey = cache.generateCacheKey( getId(), persister, factory, session.getTenantIdentifier() );
169+
final boolean put = cacheInsert( persister, cacheKey );
170170

171171
final var statistics = factory.getStatistics();
172172
if ( put && statistics.isStatisticsEnabled() ) {
@@ -184,7 +184,7 @@ private Object buildStructuredCacheEntry() {
184184
return persister.getCacheEntryStructure().structure( cacheEntry );
185185
}
186186

187-
protected boolean cacheInsert(EntityPersister persister, Object ck) {
187+
protected boolean cacheInsert(EntityPersister persister, Object cacheKey) {
188188
final var session = getSession();
189189
final var eventMonitor = session.getEventMonitor();
190190
final var cachePutEvent = eventMonitor.beginCachePutEvent();
@@ -193,7 +193,7 @@ protected boolean cacheInsert(EntityPersister persister, Object ck) {
193193
boolean insert = false;
194194
try {
195195
eventListenerManager.cachePutStart();
196-
insert = cacheAccessStrategy.insert( session, ck, cacheEntry, version );
196+
insert = cacheAccessStrategy.insert( session, cacheKey, cacheEntry, version );
197197
return insert;
198198
}
199199
finally {
@@ -252,13 +252,14 @@ protected boolean preInsert() {
252252
}
253253

254254
@Override
255-
public void doAfterTransactionCompletion(boolean success, SharedSessionContractImplementor session) throws HibernateException {
255+
public void doAfterTransactionCompletion(boolean success, SharedSessionContractImplementor session)
256+
throws HibernateException {
256257
final var persister = getPersister();
257258
if ( success && isCachePutEnabled( persister, getSession() ) ) {
258259
final var cache = persister.getCacheAccessStrategy();
259260
final var factory = session.getFactory();
260-
final Object ck = cache.generateCacheKey( getId(), persister, factory, session.getTenantIdentifier() );
261-
final boolean put = cacheAfterInsert( cache, ck );
261+
final Object cacheKey = cache.generateCacheKey( getId(), persister, factory, session.getTenantIdentifier() );
262+
final boolean put = cacheAfterInsert( cache, cacheKey );
262263

263264
final var statistics = factory.getStatistics();
264265
if ( put && statistics.isStatisticsEnabled() ) {
@@ -271,15 +272,15 @@ public void doAfterTransactionCompletion(boolean success, SharedSessionContractI
271272
postCommitInsert( success );
272273
}
273274

274-
protected boolean cacheAfterInsert(EntityDataAccess cache, Object ck) {
275+
protected boolean cacheAfterInsert(EntityDataAccess cache, Object cacheKey) {
275276
final var session = getSession();
276277
final var eventListenerManager = session.getEventListenerManager();
277278
final var eventMonitor = session.getEventMonitor();
278279
final var cachePutEvent = eventMonitor.beginCachePutEvent();
279280
boolean afterInsert = false;
280281
try {
281282
eventListenerManager.cachePutStart();
282-
afterInsert = cache.afterInsert( session, ck, cacheEntry, version );
283+
afterInsert = cache.afterInsert( session, cacheKey, cacheEntry, version );
283284
return afterInsert;
284285
}
285286
finally {

‎hibernate-core/src/main/java/org/hibernate/action/internal/EntityUpdateAction.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public void execute() throws HibernateException {
151151
handleNaturalIdLocalResolutions( id, persister, persistenceContext );
152152

153153
final Object previousVersion = getPreviousVersion();
154-
final Object ck = lockCacheItem( previousVersion );
154+
final Object cacheKey = lockCacheItem( previousVersion );
155155
final var eventMonitor = session.getEventMonitor();
156156
final var event = eventMonitor.beginEntityUpdateEvent();
157157
boolean success = false;
@@ -179,7 +179,7 @@ public void execute() throws HibernateException {
179179
}
180180
handleGeneratedProperties( entry, generatedValues );
181181
handleDeleted( entry );
182-
updateCacheItem( previousVersion, ck, entry );
182+
updateCacheItem( previousVersion, cacheKey, entry );
183183
handleNaturalIdSharedResolutions( id, persister, persistenceContext );
184184
postUpdate();
185185

@@ -215,17 +215,17 @@ protected void handleNaturalIdSharedResolutions(Object id, EntityPersister persi
215215
}
216216
}
217217

218-
protected void updateCacheItem(Object previousVersion, Object ck, EntityEntry entry) {
218+
protected void updateCacheItem(Object previousVersion, Object cacheKey, EntityEntry entry) {
219219
final var persister = getPersister();
220220
if ( persister.canWriteToCache() ) {
221221
final var session = getSession();
222222
if ( isCacheInvalidationRequired( persister, session ) || entry.getStatus() != Status.MANAGED ) {
223-
persister.getCacheAccessStrategy().remove( session, ck );
223+
persister.getCacheAccessStrategy().remove( session, cacheKey );
224224
}
225225
else if ( session.getCacheMode().isPutEnabled() ) {
226226
//TODO: inefficient if that cache is just going to ignore the updated state!
227227
cacheEntry = buildStructuredCacheEntry();
228-
final boolean put = updateCache( persister, previousVersion, ck );
228+
final boolean put = updateCache( persister, previousVersion, cacheKey );
229229

230230
final var statistics = session.getFactory().getStatistics();
231231
if ( put && statistics.isStatisticsEnabled() ) {
@@ -318,21 +318,21 @@ protected Object lockCacheItem(Object previousVersion) {
318318
if ( persister.canWriteToCache() ) {
319319
final var session = getSession();
320320
final var cache = persister.getCacheAccessStrategy();
321-
final Object ck = cache.generateCacheKey(
321+
final Object cacheKey = cache.generateCacheKey(
322322
getId(),
323323
persister,
324324
session.getFactory(),
325325
session.getTenantIdentifier()
326326
);
327-
lock = cache.lockItem( session, ck, previousVersion );
328-
return ck;
327+
lock = cache.lockItem( session, cacheKey, previousVersion );
328+
return cacheKey;
329329
}
330330
else {
331331
return null;
332332
}
333333
}
334334

335-
protected boolean updateCache(EntityPersister persister, Object previousVersion, Object ck) {
335+
protected boolean updateCache(EntityPersister persister, Object previousVersion, Object cacheKey) {
336336
final var session = getSession();
337337
final var eventMonitor = session.getEventMonitor();
338338
final var cachePutEvent = eventMonitor.beginCachePutEvent();
@@ -341,7 +341,7 @@ protected boolean updateCache(EntityPersister persister, Object previousVersion,
341341
boolean update = false;
342342
try {
343343
eventListenerManager.cachePutStart();
344-
update = cacheAccessStrategy.update( session, ck, cacheEntry, nextVersion, previousVersion );
344+
update = cacheAccessStrategy.update( session, cacheKey, cacheEntry, nextVersion, previousVersion );
345345
return update;
346346
}
347347
finally {
@@ -420,18 +420,18 @@ private void updateCacheIfNecessary(boolean success, SharedSessionContractImplem
420420
if ( persister.canWriteToCache() ) {
421421
final var cache = persister.getCacheAccessStrategy();
422422
final var factory = session.getFactory();
423-
final Object ck = cache.generateCacheKey(
423+
final Object cacheKey = cache.generateCacheKey(
424424
getId(),
425425
persister,
426426
factory,
427427
session.getTenantIdentifier()
428428

429429
);
430430
if ( cacheUpdateRequired( success, persister, session ) ) {
431-
cacheAfterUpdate( cache, ck, session);
431+
cacheAfterUpdate( cache, cacheKey, session);
432432
}
433433
else {
434-
cache.unlockItem( session, ck, lock );
434+
cache.unlockItem( session, cacheKey, lock );
435435
}
436436
}
437437
}
@@ -443,14 +443,14 @@ private boolean cacheUpdateRequired(boolean success, EntityPersister persister,
443443
&& session.getCacheMode().isPutEnabled();
444444
}
445445

446-
protected void cacheAfterUpdate(EntityDataAccess cache, Object ck, SharedSessionContractImplementor session) {
446+
protected void cacheAfterUpdate(EntityDataAccess cache, Object cacheKey, SharedSessionContractImplementor session) {
447447
final var eventListenerManager = session.getEventListenerManager();
448448
final var eventMonitor = session.getEventMonitor();
449449
final var cachePutEvent = eventMonitor.beginCachePutEvent();
450450
boolean put = false;
451451
try {
452452
eventListenerManager.cachePutStart();
453-
put = cache.afterUpdate( session, ck, cacheEntry, nextVersion, previousVersion, lock );
453+
put = cache.afterUpdate( session, cacheKey, cacheEntry, nextVersion, previousVersion, lock );
454454
}
455455
finally {
456456
final var persister = getPersister();

‎hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLoadEventListener.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -461,20 +461,20 @@ private Object lockAndLoad(LoadEvent event, EntityPersister persister, EntityKey
461461
final var cache = persister.getCacheAccessStrategy();
462462

463463
final SoftLock lock;
464-
final Object ck;
464+
final Object cacheKey;
465465
final boolean canWriteToCache = persister.canWriteToCache();
466466
if ( canWriteToCache ) {
467-
ck = cache.generateCacheKey(
467+
cacheKey = cache.generateCacheKey(
468468
event.getEntityId(),
469469
persister,
470470
event.getFactory(),
471471
source.getTenantIdentifier()
472472
);
473-
lock = cache.lockItem( source, ck, null );
473+
lock = cache.lockItem( source, cacheKey, null );
474474
}
475475
else {
476476
lock = null;
477-
ck = null;
477+
cacheKey = null;
478478
}
479479

480480
final Object entity;
@@ -483,7 +483,7 @@ private Object lockAndLoad(LoadEvent event, EntityPersister persister, EntityKey
483483
}
484484
finally {
485485
if ( canWriteToCache ) {
486-
cache.unlockItem( source, ck, lock );
486+
cache.unlockItem( source, cacheKey, lock );
487487
}
488488
}
489489

0 commit comments

Comments
 (0)