Federico Simoncelli has uploaded a new change for review.
Change subject: Revert "engine: Add caching to VdsStatic, VdsDynamic, VdsGroup
and VdsSpmIdMap"
......................................................................
Revert "engine: Add caching to VdsStatic, VdsDynamic, VdsGroup and VdsSpmIdMap"
This reverts commit d5efa763c02a3418fe39ab5b4730f182eebbb039.
Conflicts:
frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
Change-Id: I7029b7386053c5f6c5a229c0706d3eab3a1929ee
Signed-off-by: Federico Simoncelli <[email protected]>
---
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/CachedEntity.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatic.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/vds_spm_id_map.java
D
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/EntityCache.java
D
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/CachedDao.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAO.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAODbFacadeImpl.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAO.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAODbFacadeImpl.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsSpmIdMapDAO.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsSpmIdMapDAODbFacadeImpl.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAO.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAODbFacadeImpl.java
M
frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
17 files changed, 33 insertions(+), 215 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/75/21475/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/CachedEntity.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/CachedEntity.java
deleted file mode 100644
index 9b7368e..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/CachedEntity.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.ovirt.engine.core.common.businessentities;
-
-
-public interface CachedEntity {
- public long getExpiration();
-
- public static final long LONG_LIVED_OBJECT = 5 * 60 * 1000;
- public static final long SHORT_LIVED_OBJECT = 1 * 60 * 1000;
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.java
index 1394299..c8c8883 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.java
@@ -16,7 +16,7 @@
@ValidVdsGroup(groups = { CreateEntity.class })
-public class VDSGroup extends IVdcQueryable implements Serializable,
BusinessEntity<Guid>, HasStoragePool<Guid>, Nameable, Commented, CachedEntity {
+public class VDSGroup extends IVdcQueryable implements Serializable,
BusinessEntity<Guid>, HasStoragePool<Guid>, Nameable, Commented {
private static final long serialVersionUID = 5659359762655478095L;
@@ -335,11 +335,6 @@
&& ObjectUtils.objectsEqual(clusterPolicyProperties,
other.clusterPolicyProperties)
&& enableBallooning == other.enableBallooning
&& detectEmulatedMachine == other.detectEmulatedMachine);
- }
-
- @Override
- public long getExpiration() {
- return CachedEntity.LONG_LIVED_OBJECT;
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java
index fd84064..8c36f2a 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java
@@ -15,7 +15,7 @@
import org.ovirt.engine.core.compat.StringHelper;
import org.ovirt.engine.core.compat.Version;
-public class VdsDynamic implements BusinessEntityWithStatus<Guid, VDSStatus>,
CachedEntity {
+public class VdsDynamic implements BusinessEntityWithStatus<Guid, VDSStatus> {
private static final long serialVersionUID = -6010035855157006935L;
private Guid id;
@@ -691,11 +691,6 @@
&& ObjectUtils.objectsEqual(hwFamily, other.hwFamily)
&& ObjectUtils.objectsEqual(HBAs, other.HBAs)
&& ObjectUtils.objectsEqual(supportedEmulatedMachines,
other.supportedEmulatedMachines));
- }
-
- @Override
- public long getExpiration() {
- return CachedEntity.SHORT_LIVED_OBJECT;
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatic.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatic.java
index fdbf0f7..f3aad0b 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatic.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatic.java
@@ -18,7 +18,7 @@
import org.ovirt.engine.core.common.validation.group.UpdateEntity;
import org.ovirt.engine.core.compat.Guid;
-public class VdsStatic implements BusinessEntity<Guid>, Commented,
CachedEntity {
+public class VdsStatic implements BusinessEntity<Guid>, Commented {
private static final long serialVersionUID = -1425566208615075937L;
private static final int HOST_DEFAULT_SPM_PRIORITY = 5;
@@ -599,10 +599,5 @@
&& ObjectUtils.objectsEqual(vdsStrength, other.vdsStrength)
&& vdsType == other.vdsType
&& ObjectUtils.objectsEqual(sshKeyFingerprint,
other.sshKeyFingerprint));
- }
-
- @Override
- public long getExpiration() {
- return CachedEntity.LONG_LIVED_OBJECT;
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/vds_spm_id_map.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/vds_spm_id_map.java
index 8b6f521..d9552c3 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/vds_spm_id_map.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/vds_spm_id_map.java
@@ -5,7 +5,7 @@
import org.ovirt.engine.core.common.utils.ObjectUtils;
import org.ovirt.engine.core.compat.Guid;
-public class vds_spm_id_map implements Serializable, BusinessEntity<Guid>,
CachedEntity {
+public class vds_spm_id_map implements Serializable, BusinessEntity<Guid> {
private static final long serialVersionUID = 308472653338744675L;
public vds_spm_id_map() {
@@ -75,10 +75,5 @@
return (ObjectUtils.objectsEqual(storage_pool_idField,
other.storage_pool_idField)
&& ObjectUtils.objectsEqual(vds_idField, other.vds_idField)
&& vds_spm_idField == other.vds_spm_idField);
- }
-
- @Override
- public long getExpiration() {
- return CachedEntity.LONG_LIVED_OBJECT;
}
}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/EntityCache.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/EntityCache.java
deleted file mode 100644
index af41589..0000000
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/EntityCache.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package org.ovirt.engine.core.dal;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.ovirt.engine.core.common.businessentities.CachedEntity;
-import org.ovirt.engine.core.compat.Guid;
-import org.ovirt.engine.core.dao.ReadDao;
-
-public class EntityCache {
-
- private static final EntityCache instance = new EntityCache();
- private Map<EntityCacheKey, EntityCacheItem> cache = new
HashMap<EntityCacheKey, EntityCacheItem>();
-
- private EntityCache() {
-
- }
-
- public static EntityCache getInstance() {
- return instance;
- }
-
- public <T extends CachedEntity> T getFromCache(Guid id, ReadDao dao) {
- EntityCacheKey key = new EntityCacheKey(id, dao);
- T instance = EntityCache.getInstance().get(key);
- if (instance == null) {
- instance = (T) dao.get(id);
- EntityCache.getInstance().put(key, instance);
- }
- return instance;
-
- }
-
- private <T extends CachedEntity> T get(EntityCacheKey key) {
- EntityCacheItem item = cache.get(key);
-
- if (item == null)
- return null;
-
- if (System.currentTimeMillis() - item.getPlacedInCache() >
item.getEntity().getExpiration())
- return null;
-
- return (T) item.getEntity();
- }
-
- private void put(EntityCacheKey key, CachedEntity entity) {
- cache.put(key, new EntityCacheItem(entity));
- }
- private class EntityCacheItem {
- private CachedEntity entity;
- private long placedInCache;
-
- public EntityCacheItem(CachedEntity entity) {
- this.entity = entity;
- placedInCache = System.currentTimeMillis();
- }
-
- public CachedEntity getEntity() {
- return entity;
- }
-
- public long getPlacedInCache() {
- return placedInCache;
- }
- }
-
- private class EntityCacheKey {
- private Guid key;
- private ReadDao dao;
-
- public EntityCacheKey(Guid key, ReadDao dao) {
- super();
- this.key = key;
- this.dao = dao;
- }
-
- public Guid getKey() {
- return key;
- }
-
- public void setKey(Guid key) {
- this.key = key;
- }
-
- public ReadDao getDao() {
- return dao;
- }
-
- public void setDao(ReadDao dao) {
- this.dao = dao;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + getOuterType().hashCode();
- result = prime * result + ((dao == null) ? 0 :
dao.getClass().hashCode());
- result = prime * result + ((key == null) ? 0 : key.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- EntityCacheKey other = (EntityCacheKey) obj;
- if (!getOuterType().equals(other.getOuterType()))
- return false;
- if (dao == null) {
- if (other.dao != null)
- return false;
- } else if (!dao.getClass().equals(other.dao.getClass()))
- return false;
- if (key == null) {
- if (other.key != null)
- return false;
- } else if (!key.equals(other.key))
- return false;
- return true;
- }
-
- private EntityCache getOuterType() {
- return EntityCache.this;
- }
-
- }
-}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/CachedDao.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/CachedDao.java
deleted file mode 100644
index caa5b44..0000000
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/CachedDao.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.ovirt.engine.core.dao;
-
-import java.io.Serializable;
-
-import org.ovirt.engine.core.common.businessentities.BusinessEntity;
-
-public interface CachedDao<T extends BusinessEntity<ID>, ID extends
Serializable> {
- /**
- * Retrieves the entity with the given id from the cache.
- * @param id
- * The id to look by (can't be <code>null</code>).
- * @return The entity instance, or <code>null</code> if not found.
- */
- public T getFromCache(ID id);
-
-}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java
index 899c94b..123e88f 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java
@@ -350,10 +350,12 @@
public VDS getPartial(Guid vdsId) {
VDS vdsPartial = new VDS();
-
vdsPartial.setStaticData(DbFacade.getInstance().getVdsStaticDao().getFromCache(vdsId));
-
vdsPartial.setDynamicData(DbFacade.getInstance().getVdsDynamicDao().getFromCache(vdsId));
+ // TODO: From cache
+
vdsPartial.setStaticData(DbFacade.getInstance().getVdsStaticDao().get(vdsId));
+
vdsPartial.setDynamicData(DbFacade.getInstance().getVdsDynamicDao().get(vdsId));
- VDSGroup group =
DbFacade.getInstance().getVdsGroupDao().getFromCache(vdsPartial.getVdsGroupId());
+ // TODO: From cache
+ VDSGroup group =
DbFacade.getInstance().getVdsGroupDao().get(vdsPartial.getVdsGroupId());
vdsPartial.setVdsGroupCompatibilityVersion(group.getcompatibility_version());
vdsPartial.setVdsGroupCpuName(group.getcpu_name());
vdsPartial.setVdsGroupDescription(group.getdescription());
@@ -368,6 +370,9 @@
@Override
public void reloadPartial(VDS vds) {
vds.setStatisticsData(DbFacade.getInstance().getVdsStatisticsDao().get(vds.getId()));
-
vds.setVdsSpmId(DbFacade.getInstance().getVdsSpmIdMapDao().getFromCache(vds.getId()).getvds_spm_id());
+
+ // TODO: From cache?!?
+
vds.setVdsSpmId(DbFacade.getInstance().getVdsSpmIdMapDao().get(vds.getId()).getvds_spm_id());
+
}
}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAO.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAO.java
index a8335fa..7975700 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAO.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAO.java
@@ -9,7 +9,7 @@
*
*
*/
-public interface VdsDynamicDAO extends GenericDao<VdsDynamic, Guid>,
StatusAwareDao<Guid, VDSStatus>, CachedDao<VdsDynamic, Guid> {
+public interface VdsDynamicDAO extends GenericDao<VdsDynamic, Guid>,
StatusAwareDao<Guid, VDSStatus> {
/**
* Update entity net_config_dirty field
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAODbFacadeImpl.java
index 59f3137..171ab20 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAODbFacadeImpl.java
@@ -12,7 +12,6 @@
import
org.ovirt.engine.core.common.businessentities.VdsTransparentHugePagesState;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.RpmVersion;
-import org.ovirt.engine.core.dal.EntityCache;
import org.ovirt.engine.core.dal.dbbroker.DbFacadeUtils;
import org.ovirt.engine.core.utils.serialization.json.JsonObjectDeserializer;
import org.ovirt.engine.core.utils.serialization.json.JsonObjectSerializer;
@@ -267,10 +266,5 @@
getCallsHandler().executeModification("UpdatePartialVdsDynamicCalc",
parameterSource);
- }
-
- @Override
- public VdsDynamic getFromCache(Guid id) {
- return EntityCache.getInstance().getFromCache(id, this);
}
}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAO.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAO.java
index c49a784..7e0e410 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAO.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAO.java
@@ -10,7 +10,16 @@
* <code>VdsGroupDAO</code> defines a type that performs CRUD operations on
instances of {@link VDSGroup}.
*
*/
-public interface VdsGroupDAO extends ReadDao<VDSGroup, Guid>, DAO,
SearchDAO<VDSGroup>, CachedDao<VDSGroup, Guid> {
+public interface VdsGroupDAO extends DAO, SearchDAO<VDSGroup> {
+ /**
+ * Gets the group with the specified id.
+ *
+ * @param id
+ * the group id
+ * @return the group
+ */
+ VDSGroup get(Guid id);
+
/**
* Gets the group with the specified id, with optional permission
filtering.
*
@@ -79,6 +88,13 @@
/**
* Retrieves all VDS groups.
*
+ * @return the list of groups
+ */
+ List<VDSGroup> getAll();
+
+ /**
+ * Retrieves all VDS groups.
+ *
* @param userID
* the ID of the user requesting the information
* @param isFiltered
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAODbFacadeImpl.java
index 989c56f..11f03eb 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAODbFacadeImpl.java
@@ -10,7 +10,6 @@
import org.ovirt.engine.core.common.businessentities.VDSGroup;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.Version;
-import org.ovirt.engine.core.dal.EntityCache;
import org.ovirt.engine.core.dal.dbbroker.DbFacadeUtils;
import org.ovirt.engine.core.utils.SerializationFactory;
import org.springframework.jdbc.core.RowMapper;
@@ -222,10 +221,5 @@
VdsGroupRowMapper.instance,
getCustomMapSqlParameterSource()
.addValue("cluster_policy_id", clusterPolicyId));
- }
-
- @Override
- public VDSGroup getFromCache(Guid id) {
- return EntityCache.getInstance().getFromCache(id, this);
}
}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsSpmIdMapDAO.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsSpmIdMapDAO.java
index 62b733b..7423ccb 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsSpmIdMapDAO.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsSpmIdMapDAO.java
@@ -8,7 +8,7 @@
/**
* <code>VdsSpmIdMapDAO</code> defines a type that performs CRUD operations on
instances of {@link vds_spm_iso_map}.
*/
-public interface VdsSpmIdMapDAO extends GenericDao<vds_spm_id_map, Guid>,
CachedDao<vds_spm_id_map, Guid> {
+public interface VdsSpmIdMapDAO extends GenericDao<vds_spm_id_map, Guid> {
/**
* Gets the map for a given storage pool and vds id
*
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsSpmIdMapDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsSpmIdMapDAODbFacadeImpl.java
index b295865..a61fc62 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsSpmIdMapDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsSpmIdMapDAODbFacadeImpl.java
@@ -7,7 +7,6 @@
import org.apache.commons.lang.NotImplementedException;
import org.ovirt.engine.core.common.businessentities.vds_spm_id_map;
import org.ovirt.engine.core.compat.Guid;
-import org.ovirt.engine.core.dal.EntityCache;
import org.springframework.jdbc.core.RowMapper;
import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
@@ -89,10 +88,5 @@
entity.setvds_spm_id(rs.getInt("vds_spm_id"));
return entity;
}
- }
-
- @Override
- public vds_spm_id_map getFromCache(Guid id) {
- return EntityCache.getInstance().getFromCache(id, this);
}
}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAO.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAO.java
index 95b986f..d24b406 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAO.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAO.java
@@ -10,7 +10,7 @@
*
*
*/
-public interface VdsStaticDAO extends GenericDao<VdsStatic, Guid>,
CachedDao<VdsStatic, Guid> {
+public interface VdsStaticDAO extends GenericDao<VdsStatic, Guid> {
/**
* Retrieves the instance for the given host name.
*
@@ -37,5 +37,4 @@
* @return the list of instances
*/
List<VdsStatic> getAllForVdsGroup(Guid vdsGroup);
-
}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAODbFacadeImpl.java
index 254c0a1..eb42f14 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAODbFacadeImpl.java
@@ -8,7 +8,6 @@
import org.ovirt.engine.core.common.businessentities.VDSType;
import org.ovirt.engine.core.common.businessentities.VdsStatic;
import org.ovirt.engine.core.compat.Guid;
-import org.ovirt.engine.core.dal.EntityCache;
import org.ovirt.engine.core.dal.dbbroker.DbFacadeUtils;
import org.springframework.jdbc.core.RowMapper;
import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
@@ -160,11 +159,6 @@
return entity;
}
- }
-
- @Override
- public VdsStatic getFromCache(Guid id) {
- return EntityCache.getInstance().getFromCache(id, this);
}
}
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
index b85700c..d580ccd 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
+++
b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
@@ -47,7 +47,6 @@
<include name="common/businessentities/DiskAlignment.java" />
<include
name="common/businessentities/OpenStackImageProviderProperties.java" />
<include name="common/businessentities/VmBalloonInfo.java" />
- <include name="common/businessentities/CachedEntity.java" />
<include name="common/businessentities/ArchitectureType.java" />
<!-- Network business entities -->
--
To view, visit http://gerrit.ovirt.org/21475
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7029b7386053c5f6c5a229c0706d3eab3a1929ee
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
