From fbae6b4fe48502391b49c41654619a256d061401 Mon Sep 17 00:00:00 2001 From: Gerd Behrmann Date: Thu, 21 Nov 2013 12:56:19 +0100 Subject: [PATCH] pnfsmanager: Drop legacy PnfsGetFileMetaDataMessage Target: trunk Require-notes: no Require-book: no Acked-by: Paul Millar Patch: http://rb.dcache.org/r/6265/ --- .../namespace/PnfsManagerV3.java | 3 - .../java/diskCacheV111/util/PnfsHandler.java | 17 ----- .../vehicles/PnfsGetFileMetaDataMessage.java | 74 ------------------- .../vehicles/PnfsGetStorageInfoMessage.java | 39 +++------- 4 files changed, 12 insertions(+), 121 deletions(-) delete mode 100644 modules/dcache/src/main/java/diskCacheV111/vehicles/PnfsGetFileMetaDataMessage.java diff --git a/modules/dcache/src/main/java/diskCacheV111/namespace/PnfsManagerV3.java b/modules/dcache/src/main/java/diskCacheV111/namespace/PnfsManagerV3.java index 212b61b4869..4f2fb44b6e5 100644 --- a/modules/dcache/src/main/java/diskCacheV111/namespace/PnfsManagerV3.java +++ b/modules/dcache/src/main/java/diskCacheV111/namespace/PnfsManagerV3.java @@ -43,7 +43,6 @@ import diskCacheV111.vehicles.PnfsDeleteEntryNotificationMessage; import diskCacheV111.vehicles.PnfsFlagMessage; import diskCacheV111.vehicles.PnfsGetCacheLocationsMessage; -import diskCacheV111.vehicles.PnfsGetFileMetaDataMessage; import diskCacheV111.vehicles.PnfsGetParentMessage; import diskCacheV111.vehicles.PnfsGetStorageInfoMessage; import diskCacheV111.vehicles.PnfsMapPathMessage; @@ -118,7 +117,6 @@ public class PnfsManagerV3 PnfsGetCacheLocationsMessage.class, PnfsGetStorageInfoMessage.class, PnfsMapPathMessage.class, - PnfsGetFileMetaDataMessage.class, PnfsGetParentMessage.class, PnfsCreateEntryMessage.class, PnfsCreateDirectoryMessage.class, @@ -174,7 +172,6 @@ private void populateRequestMap() _gauges.addGauge(PnfsCreateEntryMessage.class); _gauges.addGauge(PnfsDeleteEntryMessage.class); _gauges.addGauge(PnfsGetStorageInfoMessage.class); - _gauges.addGauge(PnfsGetFileMetaDataMessage.class); _gauges.addGauge(PnfsSetFileMetaDataMessage.class); _gauges.addGauge(PnfsMapPathMessage.class); _gauges.addGauge(PnfsRenameMessage.class); diff --git a/modules/dcache/src/main/java/diskCacheV111/util/PnfsHandler.java b/modules/dcache/src/main/java/diskCacheV111/util/PnfsHandler.java index e77745e1ad5..19ff8d04d2c 100644 --- a/modules/dcache/src/main/java/diskCacheV111/util/PnfsHandler.java +++ b/modules/dcache/src/main/java/diskCacheV111/util/PnfsHandler.java @@ -336,23 +336,6 @@ public PnfsGetStorageInfoMessage getStorageInfoByPnfsId( PnfsId pnfsId ) throws CacheException { return pnfsRequest(new PnfsGetStorageInfoMessage( pnfsId )) ; - } - - public PnfsGetStorageInfoMessage getStorageInfoByPath( String pnfsPath ) - throws CacheException { - return getStorageInfoByPath(pnfsPath, false) ; - - } - - public PnfsGetStorageInfoMessage getStorageInfoByPath( String pnfsPath , - boolean requestChecksum) - throws CacheException { - - PnfsGetStorageInfoMessage sInfo = new PnfsGetStorageInfoMessage() ; - sInfo.setPnfsPath( pnfsPath ) ; - sInfo.setChecksumsRequested(requestChecksum); - return pnfsRequest( sInfo ) ; - } public PnfsId getParentOf(PnfsId pnfsId) diff --git a/modules/dcache/src/main/java/diskCacheV111/vehicles/PnfsGetFileMetaDataMessage.java b/modules/dcache/src/main/java/diskCacheV111/vehicles/PnfsGetFileMetaDataMessage.java deleted file mode 100644 index 77482f7a7b2..00000000000 --- a/modules/dcache/src/main/java/diskCacheV111/vehicles/PnfsGetFileMetaDataMessage.java +++ /dev/null @@ -1,74 +0,0 @@ -// $Id: PnfsGetFileMetaDataMessage.java,v 1.4 2004-11-05 12:07:19 tigran Exp $ -package diskCacheV111.vehicles ; - -import java.util.Set; - -import diskCacheV111.util.FileMetaData; -import diskCacheV111.util.PnfsId; - -import org.dcache.namespace.FileAttribute; -import org.dcache.vehicles.PnfsGetFileAttributes; - -import static org.dcache.namespace.FileAttribute.CHECKSUM; -import static org.dcache.namespace.FileAttribute.PNFSID; - -public class PnfsGetFileMetaDataMessage extends PnfsGetFileAttributes -{ - private boolean _resolve = true ; - - private static final long serialVersionUID = 1591894346369251468L; - - public PnfsGetFileMetaDataMessage() - { - super((PnfsId) null, FileMetaData.getKnownFileAttributes()); - _attributes.add(PNFSID); - setReplyRequired(true); - } - - public PnfsGetFileMetaDataMessage(Set attr) - { - super((PnfsId) null, FileMetaData.getKnownFileAttributes()); - _attributes.add(PNFSID); - _attributes.addAll(attr); - setReplyRequired(true); - } - - public PnfsGetFileMetaDataMessage(PnfsId pnfsId) - { - super(pnfsId, FileMetaData.getKnownFileAttributes()); - _attributes.add(PNFSID); - setReplyRequired(true); - } - - public void setResolve( boolean resolve ){ _resolve = resolve ; } - public boolean resolve(){ return _resolve ; } - - public void setChecksumsRequested(boolean checksumsRequested) - { - if (checksumsRequested) { - _attributes.add(CHECKSUM); - } else { - _attributes.remove(CHECKSUM); - } - } - - @Override - public boolean invalidates(Message message) - { - return false; - } - - @Override - public boolean fold(Message message) - { - if (message.getClass().equals(PnfsGetFileMetaDataMessage.class)) { - PnfsGetFileMetaDataMessage other = - (PnfsGetFileMetaDataMessage) message; - if (other.resolve() == resolve()) { - return super.fold(message); - } - } - - return false; - } -} diff --git a/modules/dcache/src/main/java/diskCacheV111/vehicles/PnfsGetStorageInfoMessage.java b/modules/dcache/src/main/java/diskCacheV111/vehicles/PnfsGetStorageInfoMessage.java index 5da83d5ed4a..988b27444bd 100644 --- a/modules/dcache/src/main/java/diskCacheV111/vehicles/PnfsGetStorageInfoMessage.java +++ b/modules/dcache/src/main/java/diskCacheV111/vehicles/PnfsGetStorageInfoMessage.java @@ -1,46 +1,40 @@ -// $Id: PnfsGetStorageInfoMessage.java,v 1.7 2006-04-11 09:47:53 tigran Exp $ package diskCacheV111.vehicles; import java.util.Set; +import diskCacheV111.util.FileMetaData; import diskCacheV111.util.PnfsId; import org.dcache.namespace.FileAttribute; import org.dcache.vehicles.FileAttributes; +import org.dcache.vehicles.PnfsGetFileAttributes; import static org.dcache.namespace.FileAttribute.*; -public class PnfsGetStorageInfoMessage extends PnfsGetFileMetaDataMessage { - - private boolean _followLinks = true; - +public class PnfsGetStorageInfoMessage extends PnfsGetFileAttributes +{ private static final long serialVersionUID = -2574949600859502380L; - public PnfsGetStorageInfoMessage() + public PnfsGetStorageInfoMessage(Set attr) { - super(); - _attributes.add(STORAGEINFO); - _attributes.add(ACCESS_LATENCY); - _attributes.add(RETENTION_POLICY); - _attributes.add(SIZE); + this(); + _attributes.addAll(attr); } - public PnfsGetStorageInfoMessage(Set attr) + public PnfsGetStorageInfoMessage() { - super(attr); - _attributes.add(STORAGEINFO); - _attributes.add(ACCESS_LATENCY); - _attributes.add(RETENTION_POLICY); - _attributes.add(SIZE); + this((PnfsId) null); } public PnfsGetStorageInfoMessage(PnfsId pnfsId) { - super(pnfsId); + super(pnfsId, FileMetaData.getKnownFileAttributes()); + _attributes.add(PNFSID); _attributes.add(STORAGEINFO); _attributes.add(ACCESS_LATENCY); _attributes.add(RETENTION_POLICY); _attributes.add(SIZE); + setReplyRequired(true); } @Override @@ -56,13 +50,4 @@ public StorageInfo getStorageInfo() ? null : _fileAttributes.getStorageInfo(); } - - @Override - public boolean resolve() { return this._followLinks; } - @Override - public void setResolve(boolean followLinks) - { - _followLinks = followLinks; - super.setResolve(followLinks); - } }