From 1597e3c8799ba62c9ec5da20d43a6cd712dfee99 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Sun, 16 Dec 2012 19:20:20 +0000 Subject: [PATCH] Cache size reporting. --- .../main/java/com/gempukku/lotro/cache/CacheManager.java | 7 +++++++ .../src/main/java/com/gempukku/lotro/cache/Cached.java | 1 + .../com/gempukku/lotro/collection/CachedCollectionDAO.java | 5 +++++ .../com/gempukku/lotro/collection/CachedTransferDAO.java | 6 +++++- .../src/main/java/com/gempukku/lotro/db/CachedDeckDAO.java | 5 +++++ .../main/java/com/gempukku/lotro/db/CachedMerchantDAO.java | 5 +++++ .../main/java/com/gempukku/lotro/db/CachedPlayerDAO.java | 5 +++++ .../com/gempukku/lotro/league/CachedLeagueMatchDAO.java | 5 +++++ .../lotro/league/CachedLeagueParticipationDAO.java | 5 +++++ .../main/java/com/gempukku/lotro/server/AdminResource.java | 6 +++++- 10 files changed, 48 insertions(+), 2 deletions(-) diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/cache/CacheManager.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/cache/CacheManager.java index 670b16179..ee4103177 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/cache/CacheManager.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/cache/CacheManager.java @@ -14,4 +14,11 @@ public class CacheManager { for (Cached cache : _caches) cache.clearCache(); } + + public int getTotalCount() { + int total = 0; + for (Cached cache : _caches) + total+=cache.getItemCount(); + return total; + } } diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/cache/Cached.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/cache/Cached.java index 85970669e..a6e8aaa6d 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/cache/Cached.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/cache/Cached.java @@ -2,4 +2,5 @@ package com.gempukku.lotro.cache; public interface Cached { public void clearCache(); + public int getItemCount(); } diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/collection/CachedCollectionDAO.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/collection/CachedCollectionDAO.java index 7d1b4b49c..abdb3fbd9 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/collection/CachedCollectionDAO.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/collection/CachedCollectionDAO.java @@ -23,6 +23,11 @@ public class CachedCollectionDAO implements CollectionDAO, Cached { _playerCollections.clear(); } + @Override + public int getItemCount() { + return _playerCollections.size(); + } + @Override public CardCollection getPlayerCollection(int playerId, String type) throws SQLException, IOException { String key = constructCacheKey(playerId, type); diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/collection/CachedTransferDAO.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/collection/CachedTransferDAO.java index 3837e51e9..43cb42abf 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/collection/CachedTransferDAO.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/collection/CachedTransferDAO.java @@ -16,12 +16,16 @@ public class CachedTransferDAO implements TransferDAO, Cached { _delegate = delegate; } - @Override public void clearCache() { _playersWithoutDelivery.clear(); } + @Override + public int getItemCount() { + return _playersWithoutDelivery.size(); + } + public boolean hasUndeliveredPackages(String player) { if (_playersWithoutDelivery.contains(player)) return false; diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/CachedDeckDAO.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/CachedDeckDAO.java index af31e8c2b..5ed2640d3 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/CachedDeckDAO.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/CachedDeckDAO.java @@ -25,6 +25,11 @@ public class CachedDeckDAO implements DeckDAO, Cached { _decks.clear(); } + @Override + public int getItemCount() { + return _playerDeckNames.size()+_decks.size(); + } + @Override public LotroDeck buildDeckFromContents(String deckName, String contents) { return _delegate.buildDeckFromContents(deckName, contents); diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/CachedMerchantDAO.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/CachedMerchantDAO.java index a734bbd58..a5bb96388 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/CachedMerchantDAO.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/CachedMerchantDAO.java @@ -20,6 +20,11 @@ public class CachedMerchantDAO implements MerchantDAO, Cached { _blueprintIdLastTransaction.clear(); } + @Override + public int getItemCount() { + return _blueprintIdLastTransaction.size(); + } + @Override public void addTransaction(String blueprintId, float price, Date date, TransactionType transactionType) { _delegate.addTransaction(blueprintId, price, date, transactionType); diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/CachedPlayerDAO.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/CachedPlayerDAO.java index 08cab66c6..d670a20b9 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/CachedPlayerDAO.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/CachedPlayerDAO.java @@ -23,6 +23,11 @@ public class CachedPlayerDAO implements PlayerDAO, Cached { _playerByName.clear(); } + @Override + public int getItemCount() { + return _playerById.size()+_playerByName.size(); + } + @Override public Player getPlayer(int id) { Player player = (Player) _playerById.get(id); diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/CachedLeagueMatchDAO.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/CachedLeagueMatchDAO.java index 53b89275f..bd9f9b610 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/CachedLeagueMatchDAO.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/CachedLeagueMatchDAO.java @@ -32,6 +32,11 @@ public class CachedLeagueMatchDAO implements LeagueMatchDAO, Cached { } } + @Override + public int getItemCount() { + return _cachedMatches.size(); + } + @Override public Collection getLeagueMatches(String leagueId) { _readWriteLock.readLock().lock(); diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/CachedLeagueParticipationDAO.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/CachedLeagueParticipationDAO.java index 109ea7568..e431542a8 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/CachedLeagueParticipationDAO.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/CachedLeagueParticipationDAO.java @@ -65,6 +65,11 @@ public class CachedLeagueParticipationDAO implements LeagueParticipationDAO, Cac return leagueParticipants; } + @Override + public int getItemCount() { + return _cachedParticipants.size(); + } + @Override public void clearCache() { _readWriteLock.writeLock().lock(); diff --git a/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/AdminResource.java b/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/AdminResource.java index eb4858b1e..a24b6e254 100644 --- a/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/AdminResource.java +++ b/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/AdminResource.java @@ -66,9 +66,13 @@ public class AdminResource extends AbstractResource { _leagueService.clearCache(); _tournamentService.clearCache(); + int before = _cacheManager.getTotalCount(); + _cacheManager.clearCaches(); - return "OK"; + int after = _cacheManager.getTotalCount(); + + return "Before: "+before+"
OK
After: "+after; } @Path("/shutdown")