Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

93942: Merged BRANCHES/DEV/mward/post50_hbf_fixes to BRANCHES/DEV/HEAD-BUG-FIX:
      93563: Cache stats: removed the (no longer necessary) NoOpCacheStatistics class.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95015 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis 2015-01-31 15:26:26 +00:00
parent 151537105d
commit dd5ef65a3c
2 changed files with 2 additions and 73 deletions

View File

@ -1,71 +0,0 @@
/*
* Copyright (C) 2005-2014 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
package org.alfresco.repo.cache;
import java.util.HashMap;
import java.util.Map;
import org.alfresco.repo.cache.TransactionStats.OpType;
/**
* A do-nothing implementation of {@link CacheStatistics}. Used
* by the {@link TransactionalCache} if it is not explicitly
* injected with an implementation.
*
* @since 5.0
* @author Matt Ward
*/
public class NoOpCacheStatistics implements CacheStatistics
{
@Override
public void add(String cacheName, TransactionStats stats)
{
// Does nothing
}
@Override
public long count(String cacheName, OpType opType)
{
return 0;
}
@Override
public double meanTime(String cacheName, OpType opType)
{
return Double.NaN;
}
@Override
public double hitMissRatio(String cacheName)
{
return Double.NaN;
}
@Override
public long numGets(String cacheName)
{
return 0;
}
@Override
public Map<OpType, OperationStats> allStats(String cacheName)
{
return new HashMap<>();
}
}

View File

@ -93,8 +93,8 @@ public class TransactionalCache<K extends Serializable, V extends Object>
private int maxCacheSize = 500;
/** a unique string identifying this instance when binding resources */
private String resourceKeyTxnData;
/** A "null" CacheStatistics impl is used by default for backwards compatibility */
private CacheStatistics cacheStats = new NoOpCacheStatistics();
/** Use of cacheStats is guarded by the cacheStatsEnabled flag */
private CacheStatistics cacheStats;
/** Enable collection of statistics? */
private boolean cacheStatsEnabled = false;
private boolean isTenantAware = true; // true if tenant-aware (default), false if system-wide