Vered Volansky has uploaded a new change for review. Change subject: core: Remove constant SIZE_IS_NOT_AVAILABLE ......................................................................
core: Remove constant SIZE_IS_NOT_AVAILABLE Using null has the same effect, this constant only complicates things. Change-Id: Ida18353f1d5c976ee70e65045b80410dded2bb1f Related-To: https://bugzilla.redhat.com/1211057 Signed-off-by: Vered Volansky <vvola...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/RepoImage.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/constants/StorageConstants.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RepoFileMetaDataDAODbFacadeImpl.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/RepoFileMetaDataDAOTest.java M backend/manager/modules/dal/src/test/resources/fixtures.xml M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/FileStatsReturnForXmlRpc.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/DiskSizeRenderer.java A packaging/dbscripts/upgrade/03_05_1250_update_repo_file_metadata_size.sql 9 files changed, 23 insertions(+), 22 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/25/39825/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java index b0ec903..1b0ef40 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java @@ -30,7 +30,6 @@ import org.ovirt.engine.core.common.businessentities.VDSStatus; import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; -import org.ovirt.engine.core.common.constants.StorageConstants; import org.ovirt.engine.core.common.errors.VdcBLLException; import org.ovirt.engine.core.common.errors.VdcBllErrors; import org.ovirt.engine.core.common.utils.Pair; @@ -594,14 +593,18 @@ } } - private static long retrieveIsoFileSize(Map.Entry<String, Map<String, Object>> fileStats) { + private static Long retrieveIsoFileSize(Map.Entry<String, Map<String, Object>> fileStats) { try { + Object fileSize = fileStats.getValue().get(VdsProperties.size); + if (fileSize == null) { + return null; + } return Long.valueOf((String) fileStats.getValue().get(VdsProperties.size)); } catch (RuntimeException e) { // Illegal number or null are treated as not available, // handling exception in UI will be much more complicated. log.errorFormat("File's '{0}' size is illegal number", fileStats.getKey(), e); - return StorageConstants.SIZE_IS_NOT_AVAILABLE; + return null; } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/RepoImage.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/RepoImage.java index 87e72a7..adea08a 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/RepoImage.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/RepoImage.java @@ -14,7 +14,7 @@ private Guid repoDomainId; private String repoImageId; private String repoImageName; - private long size; + private Long size; private Date dateCreated; private long lastRefreshed; private ImageFileType fileType; @@ -25,7 +25,6 @@ public RepoImage() { storagePoolId = Guid.Empty; repoDomainId = Guid.Empty; - size = 0; dateCreated = new Date(); } @@ -112,14 +111,14 @@ * @param size * the size to set For future use. */ - public void setSize(long size) { + public void setSize(Long size) { this.size = size; } /** * @return the size For future use. */ - public long getSize() { + public Long getSize() { return size; } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/constants/StorageConstants.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/constants/StorageConstants.java index 187023b..6255a19 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/constants/StorageConstants.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/constants/StorageConstants.java @@ -1,7 +1,6 @@ package org.ovirt.engine.core.common.constants; public class StorageConstants { - public static final int SIZE_IS_NOT_AVAILABLE = -1; public static final int OVF_MAX_ITEMS_PER_SQL_STATEMENT = 100; public static final String HOSTED_ENGINE_LUN_DISK_ALIAS = "hosted_engine"; diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RepoFileMetaDataDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RepoFileMetaDataDAODbFacadeImpl.java index 5c03270..47fc66f 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RepoFileMetaDataDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RepoFileMetaDataDAODbFacadeImpl.java @@ -111,7 +111,7 @@ entity.setRepoDomainId(getGuidDefaultEmpty(rs, "repo_domain_id")); entity.setRepoImageId(rs.getString("repo_image_id")); entity.setRepoImageName(rs.getString("repo_image_name")); - entity.setSize(rs.getLong("size")); + entity.setSize((Long) rs.getObject("size")); entity.setDateCreated((Date) rs.getObject("date_created")); entity.setLastRefreshed(rs.getLong("last_refreshed")); entity.setFileType(ImageFileType.forValue(rs.getInt("file_type"))); diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/RepoFileMetaDataDAOTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/RepoFileMetaDataDAOTest.java index a19b686..252f95d 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/RepoFileMetaDataDAOTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/RepoFileMetaDataDAOTest.java @@ -301,7 +301,7 @@ newRepoFileMap.setFileType(ImageFileType.ISO); newRepoFileMap.setRepoImageId("isoDomain.iso"); newRepoFileMap.setLastRefreshed(System.currentTimeMillis()); - newRepoFileMap.setSize(0); + newRepoFileMap.setSize(null); newRepoFileMap.setDateCreated(null); newRepoFileMap.setRepoDomainId(FixturesTool.STORAGE_DOAMIN_NFS_ISO); return newRepoFileMap; diff --git a/backend/manager/modules/dal/src/test/resources/fixtures.xml b/backend/manager/modules/dal/src/test/resources/fixtures.xml index d381760..95cb1a7 100644 --- a/backend/manager/modules/dal/src/test/resources/fixtures.xml +++ b/backend/manager/modules/dal/src/test/resources/fixtures.xml @@ -5850,7 +5850,7 @@ <value>d034f3b2-fb9c-414a-b1be-1e642cfe57ae</value> <value>iso1.iso</value> <null /> - <value>0</value> + <null /> <value>1300701900174</value> <value>1</value> </row> @@ -5858,7 +5858,7 @@ <value>d034f3b2-fb9c-414a-b1be-1e642cfe57ae</value> <value>floppy.vfd</value> <null /> - <value>0</value> + <null /> <value>1300701900174</value> <value>2</value> </row> @@ -5866,7 +5866,7 @@ <value>d034f3b2-fb9c-414a-b1be-1e642cfe57ae</value> <value>floppy2.vfd</value> <null /> - <value>0</value> + <null /> <value>1300701900172</value> <value>2</value> </row> @@ -5874,7 +5874,7 @@ <value>d034f3b2-fb9c-414a-b1be-1e642cfe57ae</value> <value>unknown.unknown</value> <null /> - <value>0</value> + <null /> <value>1300701900171</value> <value>0</value> </row> diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/FileStatsReturnForXmlRpc.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/FileStatsReturnForXmlRpc.java index 20188eb..0871ed7 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/FileStatsReturnForXmlRpc.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/FileStatsReturnForXmlRpc.java @@ -1,9 +1,9 @@ package org.ovirt.engine.core.vdsbroker.irsbroker; -import org.ovirt.engine.core.common.constants.StorageConstants; import org.ovirt.engine.core.vdsbroker.vdsbroker.VdsProperties; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -54,11 +54,8 @@ } private void createDefaultFileStats(Object[] fileNames) { - Map<String, Object> defaultFileStats = new HashMap<>(); - defaultFileStats.put(VdsProperties.size, String.valueOf(StorageConstants.SIZE_IS_NOT_AVAILABLE)); - for (int i = 0; i < fileNames.length; i++) { - fileStats.put((String) fileNames[i], defaultFileStats); + fileStats.put((String) fileNames[i], Collections.<String, Object> emptyMap()); } } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/DiskSizeRenderer.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/DiskSizeRenderer.java index e7fec2f..822e30c 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/DiskSizeRenderer.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/DiskSizeRenderer.java @@ -2,8 +2,6 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.text.shared.AbstractRenderer; - -import org.ovirt.engine.core.common.constants.StorageConstants; import org.ovirt.engine.core.common.utils.SizeConverter; import org.ovirt.engine.core.common.utils.SizeConverter.SizeUnit; import org.ovirt.engine.ui.common.CommonApplicationConstants; @@ -34,7 +32,7 @@ } protected boolean isUnavailable(T size) { - return size == null || size.longValue() == StorageConstants.SIZE_IS_NOT_AVAILABLE; + return size == null; } @Override diff --git a/packaging/dbscripts/upgrade/03_05_1250_update_repo_file_metadata_size.sql b/packaging/dbscripts/upgrade/03_05_1250_update_repo_file_metadata_size.sql new file mode 100644 index 0000000..0d04a42 --- /dev/null +++ b/packaging/dbscripts/upgrade/03_05_1250_update_repo_file_metadata_size.sql @@ -0,0 +1,5 @@ +ALTER TABLE repo_file_meta_data ALTER COLUMN size SET DEFAULT NULL; + +UPDATE repo_file_meta_data +SET size = NULL +WHERE size = 0; \ No newline at end of file -- To view, visit https://gerrit.ovirt.org/39825 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ida18353f1d5c976ee70e65045b80410dded2bb1f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Vered Volansky <vvola...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
